diff --git a/app/build.gradle b/app/build.gradle
index 138dc055..a7ab343c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         applicationId = 'com.tutpro.baresip'
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode = 7
+        versionCode = 8
         versionName = '1.0'
         ndk {
             abiFilters 'armeabi-v7a'
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index c3d35403..f2a0a5fd 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -217,7 +217,7 @@ class BaresipService: Service() {
         if (!IS_SERVICE_RUNNING) return
         val ua = UserAgent.find(MainActivity.uas, uap)
         if (ua == null) {
-            Log.e(LOG_TAG, "updateStatus did not find ua $uap")
+            Log.w(LOG_TAG, "updateStatus did not find ua $uap")
             return
         }
         val aor = ua.account.aor
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index e657a77f..371b832e 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -314,7 +314,11 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun handleServiceEvent(event: String, uap: String, callp: String) {
-        val ua = UserAgent.find(uas, uap)!!
+        val ua = UserAgent.find(uas, uap)
+        if (ua == null) {
+            Log.w("Baresip", "handleServiceEvent '$event' did not find ua $uap")
+            return
+        }
         val aor = ua.account.aor
         val acc = ua.account
         val ev = event.split(",")