diff --git a/xpinstall/wizard/windows/setup/extra.c b/xpinstall/wizard/windows/setup/extra.c
index 76896e911f0..9c27376c664 100644
--- a/xpinstall/wizard/windows/setup/extra.c
+++ b/xpinstall/wizard/windows/setup/extra.c
@@ -6730,6 +6730,8 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
     GetPrivateProfileString(szLookupSection, "Path Reg Name", "", szName, sizeof(szName), szFileIniConfig);
 
     GetWinReg(hkeyRoot, szKey, szName, szBuf, sizeof(szBuf));
+    if(*szBuf == '\0')
+      return(FALSE);
 
     GetPrivateProfileString(szLookupSection, "Strip Filename", "", szBuf2, sizeof(szBuf2), szFileIniConfig);
     if(lstrcmpi(szBuf2, "TRUE") == 0)
diff --git a/xpinstall/wizard/windows/setup/ifuncns.c b/xpinstall/wizard/windows/setup/ifuncns.c
index 0dfa82d064d..4c5d45f612a 100644
--- a/xpinstall/wizard/windows/setup/ifuncns.c
+++ b/xpinstall/wizard/windows/setup/ifuncns.c
@@ -1327,7 +1327,7 @@ HRESULT ProcessRunApp(DWORD dwTiming, char *szSectionPrefix)
       else
         bWait = TRUE;
 
-      if (bRunApp == TRUE)
+      if ((bRunApp == TRUE) && FileExists(szTarget))
       {
         if((dwTiming == T_DEPEND_REBOOT) && (NeedReboot() == TRUE))
         {