1 files changed, 5 insertions, 3 deletions
diff --git a/apps/SdkController/SdkControllerApp/src/com/android/tools/sdkcontroller/activities/MultiTouchActivity.java b/apps/SdkController/SdkControllerApp/src/com/android/tools/sdkcontroller/activities/MultiTouchActivity.java
index be11151..cc2c2ea 100755
--- a/apps/SdkController/SdkControllerApp/src/com/android/tools/sdkcontroller/activities/MultiTouchActivity.java
+++ b/apps/SdkController/SdkControllerApp/src/com/android/tools/sdkcontroller/activities/MultiTouchActivity.java
@@ -143,9 +143,11 @@ public class MultiTouchActivity extends BaseBindingActivity
                 @Override
                 public void run() {
                     ControllerBinder binder = getServiceBinder();
-                    boolean connected = binder.isEmuConnected();
-                    mImageView.setEnabled(connected);
-                    updateStatus(connected ? "Emulated connected" : "Emulator disconnected");
+                    if (binder != null) {
+                        boolean connected = binder.isEmuConnected();
+                        mImageView.setEnabled(connected);
+                        updateStatus(connected ? "Emulated connected" : "Emulator disconnected");
+                    }
                 }
             });
         }