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 6284fec58..3f2e60b7f 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -621,9 +621,23 @@ class MeshService : Service(), Logging {
             DataPair("region", mi.region),
             DataPair("firmware", mi.firmwareVersion),
             DataPair("has_gps", mi.hasGPS),
-            DataPair("hw_model", mi.model)
+            DataPair("hw_model", mi.model),
+            DataPair("dev_error_count", myInfo.errorCount)
         )
 
+        if (myInfo.errorCode != 0) {
+            GeeksvilleApplication.analytics.track(
+                "dev_error",
+                DataPair("code", myInfo.errorCode),
+                DataPair("address", myInfo.errorAddress),
+
+                // We also include this info, because it is required to correctly decode address from the map file
+                DataPair("firmware", mi.firmwareVersion),
+                DataPair("hw_model", mi.model),
+                DataPair("region", mi.region)
+            )
+        }
+
         // Ask for the current node DB
         connectedRadio.restartNodeInfo()
 
diff --git a/app/src/main/proto b/app/src/main/proto
index 398fdf362..1b2449b50 160000
--- a/app/src/main/proto
+++ b/app/src/main/proto
@@ -1 +1 @@
-Subproject commit 398fdf362518e9d6869247cef09f2e071b715639
+Subproject commit 1b2449b50d11f66d90511559e94cdf40f525fafb