diff --git a/renderdoccmd/renderdoccmd.cpp b/renderdoccmd/renderdoccmd.cpp
index 229ca4bb6..7b019aeba 100644
--- a/renderdoccmd/renderdoccmd.cpp
+++ b/renderdoccmd/renderdoccmd.cpp
@@ -156,10 +156,13 @@ int renderdoccmd(int argc, char **argv)
 			ReplayRenderer *renderer = NULL;
 			auto status = RENDERDOC_CreateReplayRenderer(argv[1], &progress, &renderer);
 
-			if(renderer && status == eReplayCreate_Success)
-				DisplayRendererPreview(renderer);
+			if(renderer)
+			{
+				if(status == eReplayCreate_Success)
+					DisplayRendererPreview(renderer);
 
-			ReplayRenderer_Shutdown(renderer);
+				ReplayRenderer_Shutdown(renderer);
+			}
 			return 0;
 		}
 		// dump the image from a logfile
diff --git a/renderdoccmd/renderdoccmd_win32.cpp b/renderdoccmd/renderdoccmd_win32.cpp
index 9ce82c580..1e144c6d7 100644
--- a/renderdoccmd/renderdoccmd_win32.cpp
+++ b/renderdoccmd/renderdoccmd_win32.cpp
@@ -352,7 +352,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;