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 816025b7e..a0af2e02b 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -278,11 +278,18 @@ class MeshService : Service(), Logging {
                             warnUserAboutLocation()
                         }
                     is ApiException ->
-                        if (exception.statusCode == 17) {
-                            // error: cancelled by user
-                            errormsg("User cancelled location access", exception)
-                        } else {
-                            Exceptions.report(exception)
+                        when (exception.statusCode) {
+                            17 ->
+                                // error: cancelled by user
+                                errormsg("User cancelled location access", exception)
+                            8502 ->
+                                // error: cancelled by user
+                                errormsg(
+                                    "Settings-change-unavailable, user disabled location access (globally?)",
+                                    exception
+                                )
+                            else ->
+                                Exceptions.report(exception)
                         }
                     else ->
                         Exceptions.report(exception)