diff --git a/app/build.gradle b/app/build.gradle
index eb07dda82..f277b6452 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 22 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 148
-        versionName "0.4.8"
+        versionCode 149
+        versionName "0.4.9"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 29ed24219..92f689174 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -384,10 +384,10 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
             // Remove the old radio buttons and repopulate
             deviceRadioGroup.removeAllViews()
 
-            val adapter = scanModel.bluetoothAdapter!!
-            if (adapter.isEnabled) {
+            val adapter = scanModel.bluetoothAdapter
+            if (adapter != null && adapter.isEnabled) {
                 // This code requres BLE to be enabled
-                
+
                 var hasShownOurDevice = false
                 devices.values.forEach { device ->
                     hasShownOurDevice =