diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index a5a929e46..a64d837af 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -67,7 +67,7 @@ public class FDroidApp extends Application {
     // for the local repo on this device, all static since there is only one
     public static int port;
     public static String ipAddressString;
-    public static String ssid ;
+    public static String ssid;
     public static String bssid;
     public static final Repo repo = new Repo();
     public static Set<String> selectedApps = null; // init in SelectLocalAppsFragment
@@ -337,7 +337,10 @@ public class FDroidApp extends Application {
         app.stopService(new Intent(app, LocalRepoService.class));
     }
 
-    public static void restartLocalRepoService() {
+    /**
+     * Handles checking if the {@link LocalRepoService} is running, and only restarts it if it was running.
+     */
+    public static void restartLocalRepoServiceIfRunning() {
         if (localRepoServiceMessenger != null) {
             try {
                 Message msg = Message.obtain(null, LocalRepoService.RESTART, LocalRepoService.RESTART, 0);
diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
index 934dd46ed..8e470e33c 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -127,7 +127,7 @@ public class WifiStateChangeService extends Service {
             Intent intent = new Intent(BROADCAST);
             LocalBroadcastManager.getInstance(WifiStateChangeService.this).sendBroadcast(intent);
             WifiStateChangeService.this.stopSelf();
-            FDroidApp.restartLocalRepoService();
+            FDroidApp.restartLocalRepoServiceIfRunning();
         }
     }