diff --git a/app/build.gradle b/app/build.gradle
index b276c46a..1ef762cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 20205 // format is Mmmss (where M is 1+the numeric major number
-        versionName "1.2.5"
+        versionCode 20206 // format is Mmmss (where M is 1+the numeric major number
+        versionName "1.2.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // per https://developer.android.com/studio/write/vector-asset-studio
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 5b61c8b5..217ee0f2 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -1660,6 +1660,9 @@ class MeshService : Service(), Logging {
 
                 info("sendData dest=${p.to}, id=${p.id} <- ${p.bytes!!.size} bytes (connectionState=$connectionState)")
 
+                if(p.dataType == 0)
+                    throw Exception("Port numbers must be non-zero!") // we are now more strict
+
                 // Keep a record of datapackets, so GUIs can show proper chat history
                 rememberDataPacket(p)
 
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 ae01f680..46b780ec 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -583,6 +583,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
         val unsetIndex = regions.indexOf(RadioConfigProtos.RegionCode.Unset.name)
         spinner.onItemSelectedListener = null
         if(region != null) {
+            debug("current region is $region")
             var regionIndex = regions.indexOf(region.name)
             if(regionIndex == -1) // Not found, probably because the device has a region our app doesn't yet understand.  Punt and say Unset
                 regionIndex = unsetIndex
@@ -593,6 +594,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
             spinner.isEnabled = true
         }
         else {
+            warn("region is unset!")
             spinner.setSelection(unsetIndex, false)
             spinner.isEnabled = false // leave disabled, because we can't get our region
         }
diff --git a/app/src/main/proto b/app/src/main/proto
index 7de496ff..7c025b9a 160000
--- a/app/src/main/proto
+++ b/app/src/main/proto
@@ -1 +1 @@
-Subproject commit 7de496ffe941f88e9d99c2ef2c7bc01f79efe11e
+Subproject commit 7c025b9a4d54bb410ec17ee653122861b413f177