diff --git a/jdk/src/share/back/debugInit.c b/jdk/src/share/back/debugInit.c
index 7b44cad0b05..a1e366ec05f 100644
--- a/jdk/src/share/back/debugInit.c
+++ b/jdk/src/share/back/debugInit.c
@@ -1287,22 +1287,26 @@ debugInit_exit(jvmtiError error, const char *msg)
     if ( error != JVMTI_ERROR_NONE ) {
         exit_code = 1;
         if ( docoredump ) {
+            LOG_MISC(("Dumping core as requested by command line"));
             finish_logging(exit_code);
             abort();
         }
     }
+
     if ( msg==NULL ) {
         msg = "";
     }
 
     LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, msg));
 
-    gdata->vmDead = JNI_TRUE;
+    if (gdata != NULL) {
+        gdata->vmDead = JNI_TRUE;
 
-    /* Let's try and cleanup the JVMTI, if we even have one */
-    if ( gdata->jvmti != NULL ) {
-        /* Dispose of jvmti (gdata->jvmti becomes NULL) */
-        disposeEnvironment(gdata->jvmti);
+        /* Let's try and cleanup the JVMTI, if we even have one */
+        if ( gdata->jvmti != NULL ) {
+            /* Dispose of jvmti (gdata->jvmti becomes NULL) */
+            disposeEnvironment(gdata->jvmti);
+        }
     }
 
     /* Finish up logging. We reach here if JDWP is doing the exiting. */
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index f9964847152..76b82763472 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -268,9 +268,6 @@ com/sun/jdi/RepStep.java                                        generic-all
 # 8044419
 com/sun/jdi/JdbReadTwiceTest.sh                                 generic-all
 
-# 8046348
-com/sun/jdi/OptionTest.java                                     generic-all
-
 ############################################################################
 
 # jdk_util