diff --git a/src/org/fdroid/fdroid/localrepo/LocalRepoService.java b/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
index fedf2126d..fc182352d 100644
--- a/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
+++ b/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
@@ -170,6 +170,10 @@ public class LocalRepoService extends Service {
                         LocalRepoService.this,
                         getFilesDir(),
                         Preferences.get().isLocalRepoHttpsEnabled());
+                if (localHttpd == null) {
+                    Log.e(TAG, "localHttpd == null!");
+                    return;
+                }
 
                 Looper.prepare(); // must be run before creating a Handler
                 webServerThreadHandler = new Handler() {