diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index 7395e841a..7ec6e8e0d 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -93,6 +93,7 @@ class MeshService : Service(), Logging {
 
                 logAssert(
                     (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        // we have some samsung devices failing with https://issuetracker.google.com/issues/76112072#comment56 not sure what the fix is yet
                         context.startForegroundService(intent)
                     } else {
                         context.startService(intent)
@@ -1014,11 +1015,11 @@ class MeshService : Service(), Logging {
                                 proto.packet
                             )
 
-                            else -> TODO("Unexpected FromRadio variant")
+                            else -> errormsg("Unexpected FromRadio variant")
                         }
                     }
 
-                    else -> TODO("Unexpected radio interface broadcast")
+                    else -> errormsg("Unexpected radio interface broadcast")
                 }
             }
         }
diff --git a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
index b2ff2ab7e..eefb83e3f 100644
--- a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
@@ -17,6 +17,7 @@ import com.geeksville.android.Logging
 import com.geeksville.concurrent.DeferredExecution
 import com.geeksville.mesh.IRadioInterfaceService
 import com.geeksville.util.exceptionReporter
+import com.geeksville.util.ignoreException
 import com.geeksville.util.toRemoteExceptions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -216,7 +217,7 @@ class RadioInterfaceService : Service(), Logging {
             val s = runningService
             if (s != null) {
                 // Ignore any errors that happen while closing old device
-                exceptionReporter {
+                ignoreException {
                     info("shutting down old service")
                     s.setEnabled(false) // nasty, needed to force the next setEnabled call to reconnect
                 }
diff --git a/geeksville-androidlib b/geeksville-androidlib
index ac6b27b37..bfe039fa1 160000
--- a/geeksville-androidlib
+++ b/geeksville-androidlib
@@ -1 +1 @@
-Subproject commit ac6b27b3799294f70b6d119cf95e1f01ed0348ed
+Subproject commit bfe039fa19c0625b3f81f30a614c594e9c6979aa