--- a/hotspot/src/os/windows/vm/os_windows.cpp	Tue May 17 11:39:38 2016 -0400
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Tue May 17 15:44:20 2016 -0400
@@ -5277,7 +5277,8 @@
         }
       }
       DWORD err = GetLastError();
-      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED) {
+      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED &&
+         (err == ERROR_INVALID_FUNCTION && phe.lpData != NULL)) {
         HeapUnlock(heap);
         fatal("heap walk aborted with error %d", err);
       }