--- a/hotspot/src/share/vm/utilities/exceptions.cpp	Wed Aug 30 19:18:22 2017 -0400
+++ b/hotspot/src/share/vm/utilities/exceptions.cpp	Mon Aug 28 15:34:04 2017 -0700
@@ -87,13 +87,9 @@
 #endif // ASSERT
 
   if (thread->is_VM_thread()
-      || !thread->can_call_java()
-      || DumpSharedSpaces ) {
+      || !thread->can_call_java()) {
     // We do not care what kind of exception we get for the vm-thread or a thread which
     // is compiling.  We just install a dummy exception object
-    //
-    // We also cannot throw a proper exception when dumping, because we cannot run
-    // Java bytecodes now. A dummy exception will suffice.
     thread->set_pending_exception(Universe::vm_exception(), file, line);
     return true;
   }
@@ -114,13 +110,9 @@
   }
 
   if (thread->is_VM_thread()
-      || !thread->can_call_java()
-      || DumpSharedSpaces ) {
+      || !thread->can_call_java()) {
     // We do not care what kind of exception we get for the vm-thread or a thread which
     // is compiling.  We just install a dummy exception object
-    //
-    // We also cannot throw a proper exception when dumping, because we cannot run
-    // Java bytecodes now. A dummy exception will suffice.
     thread->set_pending_exception(Universe::vm_exception(), file, line);
     return true;
   }