diff --git a/reactos/dll/win32/version/info.c b/reactos/dll/win32/version/info.c
index 9fec8a14cff..2b5d535bf3f 100644
--- a/reactos/dll/win32/version/info.c
+++ b/reactos/dll/win32/version/info.c
@@ -784,6 +784,9 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,
     TRACE("(%p,%s,%p,%p)\n",
                 pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen );
 
+    if (!pBlock)
+        return FALSE;
+
     if ( !VersionInfoIs16( info ) )
     {
         BOOL ret;
@@ -836,6 +839,9 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock,
     TRACE("(%p,%s,%p,%p)\n",
                 pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen );
 
+    if (!pBlock)
+        return FALSE;
+
     if ( VersionInfoIs16( info ) )
     {
         BOOL ret;
diff --git a/reactos/dll/win32/version/version_ros.diff b/reactos/dll/win32/version/version_ros.diff
index 925ba64560c..76151743bf2 100644
--- a/reactos/dll/win32/version/version_ros.diff
+++ b/reactos/dll/win32/version/version_ros.diff
@@ -64,6 +64,26 @@ Index: info.c
      }
      else 
      {
+@@ -784,6 +784,9 @@
+     TRACE("(%p,%s,%p,%p)\n",
+                 pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen );
+ 
++    if (!pBlock)
++        return FALSE;
++
+     if ( !VersionInfoIs16( info ) )
+     {
+         BOOL ret;
+@@ -836,6 +839,9 @@
+     TRACE("(%p,%s,%p,%p)\n",
+                 pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen );
+ 
++    if (!pBlock)
++        return FALSE;
++
+     if ( VersionInfoIs16( info ) )
+     {
+         BOOL ret;
 Index: install.c
 ===================================================================
 --- install.c	(revision 23123)