diff --git a/_coverity.cmd b/_coverity.cmd
index 6098f723..b80d58aa 100644
--- a/_coverity.cmd
+++ b/_coverity.cmd
@@ -1,4 +1,6 @@
 @echo off
+set COV_DIR=E:\cov-analysis-win32-7.7.0
+set PATH=%PATH%;%COV_DIR%\bin
 set PWD=%~dp0
 rmdir cov-int /s /q >NUL 2>NUL
 del cov-int.zip >NUL 2>NUL
diff --git a/src/net.c b/src/net.c
index 25bc9966..ac1094c3 100644
--- a/src/net.c
+++ b/src/net.c
@@ -381,7 +381,8 @@ out:
 		SendMessage(hProgressDialog, UM_PROGRESS_EXIT, (WPARAM)r, 0);
 	if (fd != NULL) fclose(fd);
 	if (!r) {
-		_unlink(file);
+		if (file != NULL)
+			_unlink(file);
 		if (PromptOnError) {
 			PrintInfo(0, MSG_242);
 			SetLastError(error_code);
diff --git a/src/rufus.rc b/src/rufus.rc
index 59e0a5b4..3eb7312b 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.3.705"
+CAPTION "Rufus 2.3.706"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -317,8 +317,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,705,0
- PRODUCTVERSION 2,3,705,0
+ FILEVERSION 2,3,706,0
+ PRODUCTVERSION 2,3,706,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -335,13 +335,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.3.705"
+            VALUE "FileVersion", "2.3.706"
             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.3.705"
+            VALUE "ProductVersion", "2.3.706"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/stdlg.c b/src/stdlg.c
index 0717bed5..7851e192 100644
--- a/src/stdlg.c
+++ b/src/stdlg.c
@@ -1612,8 +1612,11 @@ LPCDLGTEMPLATE GetDialogTemplate(int Dialog_ID)
 	WCHAR* wBuf;
 	LPCDLGTEMPLATE rcTemplate = (LPCDLGTEMPLATE) GetResource(hMainInstance, MAKEINTRESOURCEA(Dialog_ID),
 		_RT_DIALOG, get_name_from_id(Dialog_ID), &size, TRUE);
-	if ((size == 0) || (rcTemplate == NULL))
+
+	if ((size == 0) || (rcTemplate == NULL)) {
+		safe_free(rcTemplate);
 		return NULL;
+	}
 	if (right_to_left_mode) {
 		// Add the RTL styles into our RC copy, so that we don't have to multiply dialog definitions in the RC
 		dwBuf = (DWORD*)rcTemplate;