diff --git a/android/tool/src/processing/app/tools/android/EmulatorController.java b/android/tool/src/processing/app/tools/android/EmulatorController.java
index 8b9d4fc63..96eac5a8a 100644
--- a/android/tool/src/processing/app/tools/android/EmulatorController.java
+++ b/android/tool/src/processing/app/tools/android/EmulatorController.java
@@ -31,5 +31,16 @@ class EmulatorController {
     // make sure that the streams are drained properly
     new StreamPump(p.getInputStream()).addTarget(System.out).start();
     new StreamPump(p.getErrorStream()).addTarget(System.err).start();
+    new Thread(new Runnable() {
+      public void run() {
+        try {
+          System.err.println("Starting to wait for emulator process.");
+          final int result = p.waitFor();
+          System.err.println("Emulator process exited with " + result);
+        } catch (final InterruptedException e) {
+          System.err.println("Emulator interrupted.");
+        }
+      }
+    });
   }
 }
diff --git a/android/tool/src/processing/app/tools/android/StreamPump.java b/android/tool/src/processing/app/tools/android/StreamPump.java
index 9e71f9521..647948666 100644
--- a/android/tool/src/processing/app/tools/android/StreamPump.java
+++ b/android/tool/src/processing/app/tools/android/StreamPump.java
@@ -79,7 +79,7 @@ class StreamPump implements Runnable {
     }
   }
 
-  private class WriterLineProcessor implements LineProcessor {
+  private static class WriterLineProcessor implements LineProcessor {
     private final PrintWriter writer;
 
     private WriterLineProcessor(final OutputStream out) {