diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java
index b16c4f0d0..867caea63 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java
@@ -38,7 +38,11 @@ public class ViewControllerLoader {
 	}
 
 	private ViewController constructController(Class<?> clazz) {
-		return controllerProviders.get(clazz).get();
+		Provider<ViewController> ctrlProvider = controllerProviders.get(clazz);
+		if (ctrlProvider == null) {
+			throw new IllegalStateException("No provider for type " + clazz.getName() + " registered.");
+		}
+		return ctrlProvider.get();
 	}
 
 }