diff --git a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
index d1f6957f1..9bf8e843b 100644
--- a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
@@ -268,7 +268,8 @@ class SoftwareUpdateService : JobIntentService(), Logging {
         fun doUpdate(context: Context, sync: SafeBluetooth, assetName: String) {
             try {
                 val g = sync.gatt!!
-                val service = g.services.find { it.uuid == SW_UPDATE_UUID }!!
+                val service = g.services.find { it.uuid == SW_UPDATE_UUID }
+                    ?: throw BLEException("Couldn't find update service")
 
                 info("Starting firmware update for $assetName")