diff --git a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
index bb6e808e3..95fbf38c1 100644
--- a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
+++ b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
@@ -122,6 +122,8 @@ public class CommonsApplication extends Application {
             Account[] allAccounts = accountManager.getAccountsByType(WikiAccountAuthenticator.COMMONS_ACCOUNT_TYPE);
             if(allAccounts.length != 0) {
                 currentAccount = allAccounts[0];
+            } else {
+                throw new RuntimeException("No accounts found!");
             }
         }
         return currentAccount;