1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime.cc b/src/runtime.cc
index 726b30c..306bb87 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -109,6 +109,10 @@ struct AbortState {
     }
     gAborting = true;
     os << "Runtime aborting...\n";
+    if (Runtime::Current() == NULL) {
+      os << "(Runtime does not yet exist!)\n";
+      return;
+    }
     Thread* self = Thread::Current();
     if (self == NULL) {
       os << "(Aborting thread was not attached to runtime!)\n";
@@ -259,14 +263,10 @@ Runtime::ParsedOptions* Runtime::ParsedOptions::Create(const Options& options, b
   const char* boot_class_path = getenv("BOOTCLASSPATH");
   if (boot_class_path != NULL) {
     parsed->boot_class_path_ = boot_class_path;
-  } else {
-    parsed->boot_class_path_ = ".";
   }
   const char* class_path = getenv("CLASSPATH");
   if (class_path != NULL) {
     parsed->class_path_ = class_path;
-  } else {
-    parsed->class_path_ = ".";
   }
 #ifdef NDEBUG
   // -Xcheck:jni is off by default for regular builds...