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 8574fa84a..7a21bf139 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -76,7 +76,8 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
             val oldEntry = oldDevs[addr]
             if (oldEntry == null || oldEntry.bonded != isBonded) {
                 val entry = BTScanEntry(
-                    result.device.name,
+                    result.device.name
+                        ?: "unnamed-$addr", // autobug: some devices might not have a name, if someone is running really old device code?
                     addr,
                     isBonded
                 )