diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7b4b8cdd5..599b4f9b5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="18" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.NFC" />
 
     <uses-permission android:name="org.fdroid.fdroid.privileged.USE_SERVICE" />
diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java
index 507e03fc7..3b15c261f 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java
@@ -436,7 +436,7 @@ public class StartSwapView extends ScrollView implements SwapWorkflowActivity.In
         viewWifiId.setVisibility(TextUtils.isEmpty(FDroidApp.ipAddressString) ? View.GONE : View.VISIBLE);
 
         WifiApControl wifiAp = WifiApControl.getInstance(getActivity());
-        if (wifiAp.isWifiApEnabled()) {
+        if (wifiAp != null && wifiAp.isWifiApEnabled()) {
             WifiConfiguration config = wifiAp.getConfiguration();
             viewWifiNetwork.setText(getContext().getString(R.string.swap_active_hotspot, config.SSID));
         } else if (TextUtils.isEmpty(FDroidApp.ssid)) {