diff --git a/renderdoccmd/renderdoccmd.cpp b/renderdoccmd/renderdoccmd.cpp
index 7b019aeba..348e7943a 100644
--- a/renderdoccmd/renderdoccmd.cpp
+++ b/renderdoccmd/renderdoccmd.cpp
@@ -229,11 +229,14 @@ int renderdoccmd(int argc, char **argv)
 				float progress = 0.0f;
 				ReplayRenderer *renderer = NULL;
 				auto status = RENDERDOC_CreateReplayRenderer(argv[2], &progress, &renderer);
+				
+				if(renderer)
+				{
+					if(status == eReplayCreate_Success)
+						DisplayRendererPreview(renderer);
 
-				if(renderer && status == eReplayCreate_Success)
-					DisplayRendererPreview(renderer);
-
-				ReplayRenderer_Shutdown(renderer);
+					ReplayRenderer_Shutdown(renderer);
+				}
 				return 0;
 			}
 			else
@@ -333,11 +336,14 @@ int renderdoccmd(int argc, char **argv)
 
 				ReplayRenderer *renderer = NULL;
 				status = RemoteRenderer_CreateProxyRenderer(remote, 0, argv[3], &progress, &renderer);
+				
+				if(renderer)
+				{
+					if(status == eReplayCreate_Success)
+						DisplayRendererPreview(renderer);
 
-				if(renderer && status == eReplayCreate_Success)
-					DisplayRendererPreview(renderer);
-
-				RemoteRenderer_Shutdown(remote);
+					ReplayRenderer_Shutdown(renderer);
+				}
 				return 0;
 			}
 			else
diff --git a/renderdoccmd/renderdoccmd_win32.cpp b/renderdoccmd/renderdoccmd_win32.cpp
index 1e144c6d7..9c0364fdb 100644
--- a/renderdoccmd/renderdoccmd_win32.cpp
+++ b/renderdoccmd/renderdoccmd_win32.cpp
@@ -385,7 +385,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInst,
 					fn = strchr(fn, '/');
 					if(fn) fn++;
 
-					if(*fn)
+					if(fn && *fn)
 					{
 						wchar_t conv[MAX_PATH] = {0};
 						wchar_t *wfn = conv;