diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java
index 5eb220b6c..f35670625 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelFactory.java
@@ -21,6 +21,7 @@ import android.arch.lifecycle.ViewModelProvider;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -28,13 +29,13 @@ import javax.inject.Singleton;
 
 @Singleton
 @NotNullByDefault
-public class ViewModelFactory implements ViewModelProvider.Factory {
+class ViewModelFactory implements ViewModelProvider.Factory {
 
 	private final Map<Class<? extends ViewModel>, Provider<ViewModel>> creators;
 
 	@Inject
-	public ViewModelFactory(
-			Map<Class<? extends ViewModel>, Provider<ViewModel>> creators) {
+	ViewModelFactory(Map<Class<? extends ViewModel>,
+			Provider<ViewModel>> creators) {
 		this.creators = creators;
 	}
 
@@ -42,8 +43,8 @@ public class ViewModelFactory implements ViewModelProvider.Factory {
 	public <T extends ViewModel> T create(Class<T> modelClass) {
 		Provider<? extends ViewModel> creator = creators.get(modelClass);
 		if (creator == null) {
-			for (Map.Entry<Class<? extends ViewModel>, Provider<ViewModel>> entry : creators
-					.entrySet()) {
+			for (Entry<Class<? extends ViewModel>, Provider<ViewModel>> entry :
+					creators.entrySet()) {
 				if (modelClass.isAssignableFrom(entry.getKey())) {
 					creator = entry.getValue();
 					break;
@@ -54,12 +55,8 @@ public class ViewModelFactory implements ViewModelProvider.Factory {
 			throw new IllegalArgumentException(
 					"unknown model class " + modelClass);
 		}
-		try {
-			//noinspection unchecked
-			return (T) creator.get();
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
+		//noinspection unchecked
+		return (T) creator.get();
 	}
 
 }