diff --git a/packages/flutter_tools/lib/executable.dart b/packages/flutter_tools/lib/executable.dart
index 54e0c81ae27..ed7f6c08b65 100644
--- a/packages/flutter_tools/lib/executable.dart
+++ b/packages/flutter_tools/lib/executable.dart
@@ -82,10 +82,14 @@ Future<Null> main(List<String> args) async {
 
   return Chain.capture/*<Future<Null>>*/(() async {
     // Initialize globals.
-    context[Logger] = new StdoutLogger();
-    context[DeviceManager] = new DeviceManager();
-    context[DevFSConfig] = new DevFSConfig();
-    Doctor.initGlobal();
+    if (context[Logger] == null)
+      context[Logger] = new StdoutLogger();
+    if (context[DeviceManager] == null)
+      context[DeviceManager] = new DeviceManager();
+    if (context[DevFSConfig] == null)
+      context[DevFSConfig] = new DevFSConfig();
+    if (context[Doctor] == null)
+      context[Doctor] = new Doctor();
 
     dynamic result = await runner.run(args);
     _exit(result is int ? result : 1);
diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart
index eec587e65e1..e70bbcb1e88 100644
--- a/packages/flutter_tools/lib/src/doctor.dart
+++ b/packages/flutter_tools/lib/src/doctor.dart
@@ -9,7 +9,6 @@ import 'package:path/path.dart' as path;
 
 import 'android/android_workflow.dart';
 import 'base/common.dart';
-import 'base/context.dart';
 import 'device.dart';
 import 'globals.dart';
 import 'ios/ios_workflow.dart';
@@ -48,10 +47,6 @@ class Doctor {
     _validators.add(new DeviceValidator());
   }
 
-  static void initGlobal() {
-    context[Doctor] = new Doctor();
-  }
-
   IOSWorkflow _iosWorkflow;
   AndroidWorkflow _androidWorkflow;
 
diff --git a/packages/flutter_tools/lib/src/hot.dart b/packages/flutter_tools/lib/src/hot.dart
index 262eccf13d2..e63e9186759 100644
--- a/packages/flutter_tools/lib/src/hot.dart
+++ b/packages/flutter_tools/lib/src/hot.dart
@@ -517,7 +517,7 @@ class HotRunner extends ResidentRunner {
     if ((pauseEvent != null) && (pauseEvent.isPauseEvent)) {
       // Isolate is paused. Stop here.
       printTrace('Skipping reassemble because isolate is paused.');
-      return OperationResult.ok;
+      return new OperationResult(OperationResult.ok.code, reloadMessage);
     }
     await _evictDirtyAssets();
     printTrace('Reassembling application');