diff --git a/cpp/iedriver/CommandHandlers/SendKeysCommandHandler.cpp b/cpp/iedriver/CommandHandlers/SendKeysCommandHandler.cpp
index 9512bbb6635fc..af7b3bac63827 100644
--- a/cpp/iedriver/CommandHandlers/SendKeysCommandHandler.cpp
+++ b/cpp/iedriver/CommandHandlers/SendKeysCommandHandler.cpp
@@ -424,6 +424,12 @@ bool SendKeysCommandHandler::GetFileSelectionDialogCandidates(std::vector<HWND>
       LOGHR(WARN, hr) << "Process of finding child dialogs of parent window failed";
       continue;
     }
+    
+    if (!current_dialog_candidates) {
+      LOGHR(WARN, hr) << "Found no dialogs as children of parent window (null candidates)";
+      continue;
+    }
+
     hr = current_dialog_candidates->get_Length(&window_array_length);
     if (FAILED(hr)) {
       LOGHR(WARN, hr) << "Could not get length of list of child dialogs of parent window";
diff --git a/cpp/iedriver/IEDriver.rc b/cpp/iedriver/IEDriver.rc
index 717f8785fd796..27c9c62e38c76 100644
--- a/cpp/iedriver/IEDriver.rc
+++ b/cpp/iedriver/IEDriver.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,141,5,10
- PRODUCTVERSION 3,141,5,10
+ FILEVERSION 3,141,5,11
+ PRODUCTVERSION 3,141,5,11
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Software Freedom Conservancy"
             VALUE "FileDescription", "Driver library for the IE driver"
-            VALUE "FileVersion", "3.141.5.10"
+            VALUE "FileVersion", "3.141.5.11"
             VALUE "InternalName", "IEDriver.dll"
             VALUE "LegalCopyright", "Copyright (C) 2019"
             VALUE "OriginalFilename", "IEDriver.dll"
             VALUE "ProductName", "Selenium WebDriver"
-            VALUE "ProductVersion", "3.141.5.10"
+            VALUE "ProductVersion", "3.141.5.11"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/iedriverserver/CHANGELOG b/cpp/iedriverserver/CHANGELOG
index 5bc12a30f5e67..c8355b62da08d 100644
--- a/cpp/iedriverserver/CHANGELOG
+++ b/cpp/iedriverserver/CHANGELOG
@@ -9,6 +9,11 @@ available via the project downloads page. Changes in "revision" field indicate
 private releases checked into the prebuilts directory of the source tree, but
 not made generally available on the downloads page.
 
+v3.151.5.11
+===========
+ * (on behalf of Reinhold Degenfellner) Fixed crash when attempting to
+   upload files. Fixes issue #6976.
+
 v3.141.5.10
 ===========
  * (on behalf of Ben Kucera) Updated proxy settings to set proxy bypass
diff --git a/cpp/iedriverserver/IEDriverServer.rc b/cpp/iedriverserver/IEDriverServer.rc
index 2394d48c8df29..60aeabe391edb 100644
--- a/cpp/iedriverserver/IEDriverServer.rc
+++ b/cpp/iedriverserver/IEDriverServer.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,141,5,10
- PRODUCTVERSION 3,141,5,10
+ FILEVERSION 3,141,5,11
+ PRODUCTVERSION 3,141,5,11
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Software Freedom Conservancy"
             VALUE "FileDescription", "Command line server for the IE driver"
-            VALUE "FileVersion", "3.141.5.10"
+            VALUE "FileVersion", "3.141.5.11"
             VALUE "InternalName", "IEDriverServer.exe"
             VALUE "LegalCopyright", "Copyright (C) 2019"
             VALUE "OriginalFilename", "IEDriverServer.exe"
             VALUE "ProductName", "Selenium WebDriver"
-            VALUE "ProductVersion", "3.141.5.10"
+            VALUE "ProductVersion", "3.141.5.11"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/prebuilt/Win32/Release/IEDriverServer.exe b/cpp/prebuilt/Win32/Release/IEDriverServer.exe
index 9e87a9ac301a1..0b8aed7c8da66 100644
Binary files a/cpp/prebuilt/Win32/Release/IEDriverServer.exe and b/cpp/prebuilt/Win32/Release/IEDriverServer.exe differ
diff --git a/cpp/prebuilt/x64/Release/IEDriverServer.exe b/cpp/prebuilt/x64/Release/IEDriverServer.exe
index 7c4b1403a405d..1e4162fac8877 100644
Binary files a/cpp/prebuilt/x64/Release/IEDriverServer.exe and b/cpp/prebuilt/x64/Release/IEDriverServer.exe differ