diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index 669c674f..f30c2be0 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -45,8 +45,8 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, char *cmdParam, int cmd
 	HACCEL haccel; 
 	g_hInstance=GetModuleHandle(0);
 	g_script=GetCommandLine();
-	if (*g_script++=='"') while (*g_script++!='"');
-	else while (*g_script++!=' ');
+  if (*g_script=='"') { g_script++; while (*g_script!='"' && *g_script) g_script++; }
+	else while (*g_script!=' ' && *g_script) g_script++;
 	while (*g_script==' ') g_script++;
 	if (!InitBranding()) {
 		MessageBox(0,NSISERROR,"Error",MB_ICONEXCLAMATION|MB_OK);