diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
index 2b0c7d6ca2048e65b67fbde5cb8deb348e16e898..5596b1cecd2b9484a468f4af0c97558a1d7bb9a5 100644
--- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
+++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
@@ -6,7 +6,6 @@ import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH;
 
-import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
@@ -71,17 +70,6 @@ public class HomeScreenActivity extends BriarActivity {
 			// The activity was launched from the splash screen
 			showButtons();
 		}
-		// Ensure uncaught exceptions thrown on worker threads kill the JVM
-		final UncaughtExceptionHandler handler =
-				Thread.getDefaultUncaughtExceptionHandler();
-		UncaughtExceptionHandler die = new UncaughtExceptionHandler() {
-			public void uncaughtException(Thread thread, Throwable throwable) {
-				handler.uncaughtException(thread, throwable);
-				if(LOG.isLoggable(INFO)) LOG.info("Exiting");
-				System.exit(0);
-			}
-		};
-		Thread.setDefaultUncaughtExceptionHandler(die);
 		// Start the service and bind to it
 		startService(new Intent(BriarService.class.getName()));
 		bindService(new Intent(BriarService.class.getName()),