diff --git a/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java
index 20960ee2546c83fc319bbbc5a1f0eeaaf07ff32b..1f878c8808406e5c6ef90f0e45562e178abcaa97 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java
@@ -85,7 +85,8 @@ public class RepeaterActivity extends BriarActivity {
 		runOnUiThreadUnlessDestroyed(() -> {
 			// TODO: Repeater Image
 			toolbarAvatar.setImageResource(R.mipmap.ic_launcher_round);
-			toolbarTitle.setText(repeater.getAuthor().getName());
+			if (repeater != null)
+				toolbarTitle.setText(repeater.getAuthor().getName());
 		});
 	}
 
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/fragment/OverviewFragment.java b/mailbox-android/src/main/java/org/briarproject/mailbox/overview/OverviewFragment.java
similarity index 100%
rename from mailbox-android/src/main/java/org/briarproject/mailbox/fragment/OverviewFragment.java
rename to mailbox-android/src/main/java/org/briarproject/mailbox/overview/OverviewFragment.java