diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java
index 904bce5bf..2ee5ae119 100644
--- a/briar-android/src/org/briarproject/android/BriarActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarActivity.java
@@ -95,18 +95,21 @@ public class BriarActivity extends RoboFragmentActivity {
 					if(LOG.isLoggable(INFO))
 						LOG.info("Interrupted while waiting for service");
 				}
-				// Finish the activity and kill the JVM
-				runOnUiThread(new Runnable() {
-					public void run() {
-						finish();
-						if(LOG.isLoggable(INFO)) LOG.info("Exiting");
-						System.exit(0);
-					}
-				});
+				finishAndExit();
 			}
 		}.start();
 	}
 
+	private void finishAndExit() {
+		runOnUiThread(new Runnable() {
+			public void run() {
+				finish();
+				if(LOG.isLoggable(INFO)) LOG.info("Exiting");
+				System.exit(0);
+			}
+		});
+	}
+
 	protected void runOnDbThread(final Runnable task) {
 		dbUiExecutor.execute(new Runnable() {
 			public void run() {