diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
index 329f25e7e..d73058856 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
@@ -449,10 +449,14 @@ public class SwapService extends Service {
 
         WifiApControl ap = WifiApControl.getInstance(this);
         if (ap != null) {
-            if (wasHotspotEnabledBeforeSwap()) {
-                ap.enable();
-            } else {
-                ap.disable();
+            try {
+                if (wasHotspotEnabledBeforeSwap()) {
+                    ap.enable();
+                } else {
+                    ap.disable();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }