diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp
index bad34b05a..66a81bfd2 100644
--- a/renderdoc/core/replay_proxy.cpp
+++ b/renderdoc/core/replay_proxy.cpp
@@ -1891,9 +1891,11 @@ void ReplayProxy::ShutdownPreviewWindow()
   if(m_Replay && m_PreviewOutput)
   {
     m_Replay->DestroyOutputWindow(m_PreviewOutput);
-    m_PreviewWindow(false, {});
     m_PreviewOutput = 0;
   }
+
+  if(m_PreviewWindow)
+    m_PreviewWindow(false, {});
 }
 
 void ReplayProxy::RefreshPreviewWindow()
diff --git a/renderdoccmd/renderdoccmd_android.cpp b/renderdoccmd/renderdoccmd_android.cpp
index b31862e12..898150969 100644
--- a/renderdoccmd/renderdoccmd_android.cpp
+++ b/renderdoccmd/renderdoccmd_android.cpp
@@ -132,7 +132,7 @@ void DisplayGenericSplash()
   EGLDisplay eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
   ANativeWindow *previewWindow = android_state->window;
 
-  if(eglDisplay)
+  if(eglDisplay && previewWindow)
   {
     int major = 0, minor = 0;
     eglInitialize(eglDisplay, &major, &minor);