diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
index 02ae13fcc5d5c7b5281b6a9c22054b54aeec98c6..40cdc12dc2adaddb4044151358f469b69187bdc0 100644
--- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
+++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
@@ -99,8 +99,12 @@ public class HomeScreenActivity extends RoboActivity {
 			showSpinner();
 			startService(new Intent(BriarService.class.getName()));
 			bindService();
-			storeLocalAuthor(referenceManager.removeReference(handle,
-					LocalAuthor.class));
+			LocalAuthor a = referenceManager.removeReference(handle,
+					LocalAuthor.class);
+			// The reference may be null if the activity has been recreated,
+			// for example due to screen rotation
+			if(a == null) showButtons();
+			else storeLocalAuthor(a);
 		} else if(databaseConfig.getEncryptionKey() == null) {
 			// The activity was launched from the splash screen
 			if(System.currentTimeMillis() < EXPIRY_DATE) showPasswordPrompt();