diff --git a/src/iso.c b/src/iso.c
index ad6d89f5..d125bdea 100644
--- a/src/iso.c
+++ b/src/iso.c
@@ -690,7 +690,7 @@ BOOL ExtractISO(const char* src_iso, const char* dest_dir, BOOL scan)
 		iso_blocking_status = 0;
 	}
 
-	/* First try to open as UDF - fallback to ISO if it failed */
+	// First try to open as UDF - fallback to ISO if it failed
 	p_udf = udf_open(src_iso);
 	if (p_udf == NULL)
 		goto try_iso;
@@ -933,7 +933,7 @@ int64_t ExtractISOFile(const char* iso, const char* iso_file, const char* dest_f
 		goto out;
 	}
 
-	/* First try to open as UDF - fallback to ISO if it failed */
+	// First try to open as UDF - fallback to ISO if it failed
 	p_udf = udf_open(iso);
 	if (p_udf == NULL)
 		goto try_iso;
@@ -1024,10 +1024,14 @@ uint32_t GetInstallWimVersion(const char* iso)
 	iso9660_stat_t *p_statbuf = NULL;
 
 	wim_path = safe_strdup(&img_report.install_wim_path[2]);
-	for (p = wim_path; p != 0; p++)
+	if (wim_path == NULL)
+		goto out;
+	// UDF indiscriminately accepts slash or backslash delimiters,
+	// but ISO-9660 requires slash
+	for (p = wim_path; *p != 0; p++)
 		if (*p == '\\') *p = '/';
 
-	/* First try to open as UDF - fallback to ISO if it failed */
+	// First try to open as UDF - fallback to ISO if it failed
 	p_udf = udf_open(iso);
 	if (p_udf == NULL)
 		goto try_iso;
diff --git a/src/rufus.rc b/src/rufus.rc
index 602a79d2..f11f1e27 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.6.818"
+CAPTION "Rufus 2.6.819"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -319,8 +319,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,818,0
- PRODUCTVERSION 2,6,818,0
+ FILEVERSION 2,6,819,0
+ PRODUCTVERSION 2,6,819,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -337,13 +337,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.6.818"
+            VALUE "FileVersion", "2.6.819"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.6.818"
+            VALUE "ProductVersion", "2.6.819"
         END
     END
     BLOCK "VarFileInfo"