diff --git a/generator/sbpg/targets/resources/sbp_java.java.j2 b/generator/sbpg/targets/resources/sbp_java.java.j2
index 1c16f8ce73..b13df2b4bf 100644
--- a/generator/sbpg/targets/resources/sbp_java.java.j2
+++ b/generator/sbpg/targets/resources/sbp_java.java.j2
@@ -55,7 +55,8 @@ public class (((m.identifier | classnameify))) extends SBPMessage {
     public (((m.identifier | classnameify))) () { super(TYPE); }
     public (((m.identifier | classnameify))) (SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException("Type mismatch for (((m.identifier | classnameify))), expected (((m.sbp_id))), actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/acquisition/MsgAcqResult.java b/java/src/com/swiftnav/sbp/acquisition/MsgAcqResult.java
index fcb704ba3c..892ec4bdf7 100644
--- a/java/src/com/swiftnav/sbp/acquisition/MsgAcqResult.java
+++ b/java/src/com/swiftnav/sbp/acquisition/MsgAcqResult.java
@@ -54,7 +54,9 @@ public MsgAcqResult() {
 
     public MsgAcqResult(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAcqResult, expected 47, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepA.java b/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepA.java
index 1fa9721a30..e3acbf6330 100644
--- a/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepA.java
+++ b/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepA.java
@@ -55,7 +55,9 @@ public MsgAcqResultDepA() {
 
     public MsgAcqResultDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAcqResultDepA, expected 21, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepB.java b/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepB.java
index 7d3dafd83d..c4d8824cc8 100644
--- a/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepB.java
+++ b/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepB.java
@@ -55,7 +55,9 @@ public MsgAcqResultDepB() {
 
     public MsgAcqResultDepB(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAcqResultDepB, expected 20, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepC.java b/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepC.java
index 135cffcc43..1d7b4a33a7 100644
--- a/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepC.java
+++ b/java/src/com/swiftnav/sbp/acquisition/MsgAcqResultDepC.java
@@ -52,7 +52,9 @@ public MsgAcqResultDepC() {
 
     public MsgAcqResultDepC(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAcqResultDepC, expected 31, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/acquisition/MsgAcqSvProfile.java b/java/src/com/swiftnav/sbp/acquisition/MsgAcqSvProfile.java
index db0e93ed4f..d7e6f30f4b 100644
--- a/java/src/com/swiftnav/sbp/acquisition/MsgAcqSvProfile.java
+++ b/java/src/com/swiftnav/sbp/acquisition/MsgAcqSvProfile.java
@@ -45,7 +45,9 @@ public MsgAcqSvProfile() {
 
     public MsgAcqSvProfile(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAcqSvProfile, expected 46, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/acquisition/MsgAcqSvProfileDep.java b/java/src/com/swiftnav/sbp/acquisition/MsgAcqSvProfileDep.java
index 64f113e9b9..cee4c4261f 100644
--- a/java/src/com/swiftnav/sbp/acquisition/MsgAcqSvProfileDep.java
+++ b/java/src/com/swiftnav/sbp/acquisition/MsgAcqSvProfileDep.java
@@ -44,7 +44,9 @@ public MsgAcqSvProfileDep() {
 
     public MsgAcqSvProfileDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAcqSvProfileDep, expected 30, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeDepA.java b/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeDepA.java
index d8e0db7442..681b349595 100644
--- a/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeDepA.java
+++ b/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeDepA.java
@@ -43,7 +43,10 @@ public MsgBootloaderHandshakeDepA() {
 
     public MsgBootloaderHandshakeDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBootloaderHandshakeDepA, expected 176, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeReq.java b/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeReq.java
index f96e383746..4cc698f4c0 100644
--- a/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeReq.java
+++ b/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeReq.java
@@ -40,7 +40,10 @@ public MsgBootloaderHandshakeReq() {
 
     public MsgBootloaderHandshakeReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBootloaderHandshakeReq, expected 179, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeResp.java b/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeResp.java
index aa26b1feab..6586a37ff6 100644
--- a/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeResp.java
+++ b/java/src/com/swiftnav/sbp/bootload/MsgBootloaderHandshakeResp.java
@@ -47,7 +47,10 @@ public MsgBootloaderHandshakeResp() {
 
     public MsgBootloaderHandshakeResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBootloaderHandshakeResp, expected 180, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/bootload/MsgBootloaderJumpToApp.java b/java/src/com/swiftnav/sbp/bootload/MsgBootloaderJumpToApp.java
index 386df2fd02..4d209cf3db 100644
--- a/java/src/com/swiftnav/sbp/bootload/MsgBootloaderJumpToApp.java
+++ b/java/src/com/swiftnav/sbp/bootload/MsgBootloaderJumpToApp.java
@@ -42,7 +42,9 @@ public MsgBootloaderJumpToApp() {
 
     public MsgBootloaderJumpToApp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBootloaderJumpToApp, expected 177, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/bootload/MsgNapDeviceDnaReq.java b/java/src/com/swiftnav/sbp/bootload/MsgNapDeviceDnaReq.java
index ad193e95f7..e9083d0515 100644
--- a/java/src/com/swiftnav/sbp/bootload/MsgNapDeviceDnaReq.java
+++ b/java/src/com/swiftnav/sbp/bootload/MsgNapDeviceDnaReq.java
@@ -42,7 +42,9 @@ public MsgNapDeviceDnaReq() {
 
     public MsgNapDeviceDnaReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgNapDeviceDnaReq, expected 222, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/bootload/MsgNapDeviceDnaResp.java b/java/src/com/swiftnav/sbp/bootload/MsgNapDeviceDnaResp.java
index 55217b7474..93147f6fb5 100644
--- a/java/src/com/swiftnav/sbp/bootload/MsgNapDeviceDnaResp.java
+++ b/java/src/com/swiftnav/sbp/bootload/MsgNapDeviceDnaResp.java
@@ -46,7 +46,9 @@ public MsgNapDeviceDnaResp() {
 
     public MsgNapDeviceDnaResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgNapDeviceDnaResp, expected 221, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ext_events/MsgExtEvent.java b/java/src/com/swiftnav/sbp/ext_events/MsgExtEvent.java
index 6b9a0cbb8b..706de26fdb 100644
--- a/java/src/com/swiftnav/sbp/ext_events/MsgExtEvent.java
+++ b/java/src/com/swiftnav/sbp/ext_events/MsgExtEvent.java
@@ -55,7 +55,9 @@ public MsgExtEvent() {
 
     public MsgExtEvent(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgExtEvent, expected 257, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/file_io/MsgFileioConfigReq.java b/java/src/com/swiftnav/sbp/file_io/MsgFileioConfigReq.java
index 6b95566fd5..ddf2dae594 100644
--- a/java/src/com/swiftnav/sbp/file_io/MsgFileioConfigReq.java
+++ b/java/src/com/swiftnav/sbp/file_io/MsgFileioConfigReq.java
@@ -44,7 +44,9 @@ public MsgFileioConfigReq() {
 
     public MsgFileioConfigReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFileioConfigReq, expected 4097, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/file_io/MsgFileioConfigResp.java b/java/src/com/swiftnav/sbp/file_io/MsgFileioConfigResp.java
index 34c20936fa..1d97aac23b 100644
--- a/java/src/com/swiftnav/sbp/file_io/MsgFileioConfigResp.java
+++ b/java/src/com/swiftnav/sbp/file_io/MsgFileioConfigResp.java
@@ -53,7 +53,9 @@ public MsgFileioConfigResp() {
 
     public MsgFileioConfigResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFileioConfigResp, expected 4098, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/file_io/MsgFileioReadDirReq.java b/java/src/com/swiftnav/sbp/file_io/MsgFileioReadDirReq.java
index e8b605985f..cbdb7c0b6c 100644
--- a/java/src/com/swiftnav/sbp/file_io/MsgFileioReadDirReq.java
+++ b/java/src/com/swiftnav/sbp/file_io/MsgFileioReadDirReq.java
@@ -54,7 +54,9 @@ public MsgFileioReadDirReq() {
 
     public MsgFileioReadDirReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFileioReadDirReq, expected 169, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/file_io/MsgFileioReadDirResp.java b/java/src/com/swiftnav/sbp/file_io/MsgFileioReadDirResp.java
index 2e1b9e22c9..491bab4087 100644
--- a/java/src/com/swiftnav/sbp/file_io/MsgFileioReadDirResp.java
+++ b/java/src/com/swiftnav/sbp/file_io/MsgFileioReadDirResp.java
@@ -49,7 +49,9 @@ public MsgFileioReadDirResp() {
 
     public MsgFileioReadDirResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFileioReadDirResp, expected 170, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/file_io/MsgFileioReadReq.java b/java/src/com/swiftnav/sbp/file_io/MsgFileioReadReq.java
index 4dbedecb73..fdc96b1b1f 100644
--- a/java/src/com/swiftnav/sbp/file_io/MsgFileioReadReq.java
+++ b/java/src/com/swiftnav/sbp/file_io/MsgFileioReadReq.java
@@ -56,7 +56,9 @@ public MsgFileioReadReq() {
 
     public MsgFileioReadReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFileioReadReq, expected 168, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/file_io/MsgFileioReadResp.java b/java/src/com/swiftnav/sbp/file_io/MsgFileioReadResp.java
index 666a18f598..188eb00a7e 100644
--- a/java/src/com/swiftnav/sbp/file_io/MsgFileioReadResp.java
+++ b/java/src/com/swiftnav/sbp/file_io/MsgFileioReadResp.java
@@ -48,7 +48,9 @@ public MsgFileioReadResp() {
 
     public MsgFileioReadResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFileioReadResp, expected 163, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/file_io/MsgFileioRemove.java b/java/src/com/swiftnav/sbp/file_io/MsgFileioRemove.java
index 8e8d31d611..43d980d46f 100644
--- a/java/src/com/swiftnav/sbp/file_io/MsgFileioRemove.java
+++ b/java/src/com/swiftnav/sbp/file_io/MsgFileioRemove.java
@@ -44,7 +44,9 @@ public MsgFileioRemove() {
 
     public MsgFileioRemove(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFileioRemove, expected 172, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/file_io/MsgFileioWriteReq.java b/java/src/com/swiftnav/sbp/file_io/MsgFileioWriteReq.java
index 8087ed08d6..101e310a85 100644
--- a/java/src/com/swiftnav/sbp/file_io/MsgFileioWriteReq.java
+++ b/java/src/com/swiftnav/sbp/file_io/MsgFileioWriteReq.java
@@ -56,7 +56,9 @@ public MsgFileioWriteReq() {
 
     public MsgFileioWriteReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFileioWriteReq, expected 173, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/file_io/MsgFileioWriteResp.java b/java/src/com/swiftnav/sbp/file_io/MsgFileioWriteResp.java
index c92f82c7f7..cd354ec783 100644
--- a/java/src/com/swiftnav/sbp/file_io/MsgFileioWriteResp.java
+++ b/java/src/com/swiftnav/sbp/file_io/MsgFileioWriteResp.java
@@ -44,7 +44,9 @@ public MsgFileioWriteResp() {
 
     public MsgFileioWriteResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFileioWriteResp, expected 171, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgFlashDone.java b/java/src/com/swiftnav/sbp/flash/MsgFlashDone.java
index 5c47c8d217..9108d77a08 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgFlashDone.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgFlashDone.java
@@ -44,7 +44,9 @@ public MsgFlashDone() {
 
     public MsgFlashDone(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFlashDone, expected 224, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgFlashErase.java b/java/src/com/swiftnav/sbp/flash/MsgFlashErase.java
index bb7210e847..c7ba73b4b3 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgFlashErase.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgFlashErase.java
@@ -47,7 +47,9 @@ public MsgFlashErase() {
 
     public MsgFlashErase(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFlashErase, expected 226, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgFlashProgram.java b/java/src/com/swiftnav/sbp/flash/MsgFlashProgram.java
index b4e56d0503..057982766f 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgFlashProgram.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgFlashProgram.java
@@ -55,7 +55,9 @@ public MsgFlashProgram() {
 
     public MsgFlashProgram(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFlashProgram, expected 230, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgFlashReadReq.java b/java/src/com/swiftnav/sbp/flash/MsgFlashReadReq.java
index 643f398f45..713314b7b6 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgFlashReadReq.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgFlashReadReq.java
@@ -52,7 +52,9 @@ public MsgFlashReadReq() {
 
     public MsgFlashReadReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFlashReadReq, expected 231, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgFlashReadResp.java b/java/src/com/swiftnav/sbp/flash/MsgFlashReadResp.java
index f4b6e7d97f..dea4aa4c13 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgFlashReadResp.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgFlashReadResp.java
@@ -52,7 +52,9 @@ public MsgFlashReadResp() {
 
     public MsgFlashReadResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFlashReadResp, expected 225, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgM25FlashWriteStatus.java b/java/src/com/swiftnav/sbp/flash/MsgM25FlashWriteStatus.java
index 023ba56609..87c06e0f3e 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgM25FlashWriteStatus.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgM25FlashWriteStatus.java
@@ -44,7 +44,9 @@ public MsgM25FlashWriteStatus() {
 
     public MsgM25FlashWriteStatus(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgM25FlashWriteStatus, expected 243, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgStmFlashLockSector.java b/java/src/com/swiftnav/sbp/flash/MsgStmFlashLockSector.java
index 28e9a4d40d..27dd1a50b5 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgStmFlashLockSector.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgStmFlashLockSector.java
@@ -43,7 +43,9 @@ public MsgStmFlashLockSector() {
 
     public MsgStmFlashLockSector(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgStmFlashLockSector, expected 227, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgStmFlashUnlockSector.java b/java/src/com/swiftnav/sbp/flash/MsgStmFlashUnlockSector.java
index fd2b4d5d03..a2a0e94179 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgStmFlashUnlockSector.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgStmFlashUnlockSector.java
@@ -43,7 +43,9 @@ public MsgStmFlashUnlockSector() {
 
     public MsgStmFlashUnlockSector(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgStmFlashUnlockSector, expected 228, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgStmUniqueIdReq.java b/java/src/com/swiftnav/sbp/flash/MsgStmUniqueIdReq.java
index 18114ce144..5e6b2b78d6 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgStmUniqueIdReq.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgStmUniqueIdReq.java
@@ -41,7 +41,9 @@ public MsgStmUniqueIdReq() {
 
     public MsgStmUniqueIdReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgStmUniqueIdReq, expected 232, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/flash/MsgStmUniqueIdResp.java b/java/src/com/swiftnav/sbp/flash/MsgStmUniqueIdResp.java
index 29d62c92ad..6c93a6c1c8 100644
--- a/java/src/com/swiftnav/sbp/flash/MsgStmUniqueIdResp.java
+++ b/java/src/com/swiftnav/sbp/flash/MsgStmUniqueIdResp.java
@@ -45,7 +45,9 @@ public MsgStmUniqueIdResp() {
 
     public MsgStmUniqueIdResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgStmUniqueIdResp, expected 229, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/imu/MsgImuAux.java b/java/src/com/swiftnav/sbp/imu/MsgImuAux.java
index cbdeaaca57..7341496405 100644
--- a/java/src/com/swiftnav/sbp/imu/MsgImuAux.java
+++ b/java/src/com/swiftnav/sbp/imu/MsgImuAux.java
@@ -49,7 +49,9 @@ public MsgImuAux() {
 
     public MsgImuAux(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgImuAux, expected 2305, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/imu/MsgImuRaw.java b/java/src/com/swiftnav/sbp/imu/MsgImuRaw.java
index 19a0cf03d0..b535b2817a 100644
--- a/java/src/com/swiftnav/sbp/imu/MsgImuRaw.java
+++ b/java/src/com/swiftnav/sbp/imu/MsgImuRaw.java
@@ -70,7 +70,9 @@ public MsgImuRaw() {
 
     public MsgImuRaw(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgImuRaw, expected 2304, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagHighLevel.java b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagHighLevel.java
index 6ee91f8a8b..d682cbfd83 100644
--- a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagHighLevel.java
+++ b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagHighLevel.java
@@ -106,7 +106,9 @@ public MsgSsrFlagHighLevel() {
 
     public MsgSsrFlagHighLevel(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrFlagHighLevel, expected 3001, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoGridPointSatLos.java b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoGridPointSatLos.java
index fbb1612242..b309e564b9 100644
--- a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoGridPointSatLos.java
+++ b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoGridPointSatLos.java
@@ -45,7 +45,10 @@ public MsgSsrFlagIonoGridPointSatLos() {
 
     public MsgSsrFlagIonoGridPointSatLos(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrFlagIonoGridPointSatLos, expected 3025, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoGridPoints.java b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoGridPoints.java
index 515cd5a023..a5c0f96bf4 100644
--- a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoGridPoints.java
+++ b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoGridPoints.java
@@ -42,7 +42,10 @@ public MsgSsrFlagIonoGridPoints() {
 
     public MsgSsrFlagIonoGridPoints(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrFlagIonoGridPoints, expected 3015, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoTileSatLos.java b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoTileSatLos.java
index 6c2cb8d6cb..bad1adce0d 100644
--- a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoTileSatLos.java
+++ b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagIonoTileSatLos.java
@@ -42,7 +42,10 @@ public MsgSsrFlagIonoTileSatLos() {
 
     public MsgSsrFlagIonoTileSatLos(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrFlagIonoTileSatLos, expected 3021, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagSatellites.java b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagSatellites.java
index 3bc801683a..667240ebcb 100644
--- a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagSatellites.java
+++ b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagSatellites.java
@@ -57,7 +57,9 @@ public MsgSsrFlagSatellites() {
 
     public MsgSsrFlagSatellites(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrFlagSatellites, expected 3005, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagTropoGridPoints.java b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagTropoGridPoints.java
index 8fa742d9ad..4feb18e822 100644
--- a/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagTropoGridPoints.java
+++ b/java/src/com/swiftnav/sbp/integrity/MsgSsrFlagTropoGridPoints.java
@@ -42,7 +42,10 @@ public MsgSsrFlagTropoGridPoints() {
 
     public MsgSsrFlagTropoGridPoints(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrFlagTropoGridPoints, expected 3011, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxCpuState.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxCpuState.java
index 18810a8b21..9aca49b0a5 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxCpuState.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxCpuState.java
@@ -61,7 +61,9 @@ public MsgLinuxCpuState() {
 
     public MsgLinuxCpuState(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxCpuState, expected 32520, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxCpuStateDepA.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxCpuStateDepA.java
index 32a3f8fd29..19f05c3529 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxCpuStateDepA.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxCpuStateDepA.java
@@ -55,7 +55,9 @@ public MsgLinuxCpuStateDepA() {
 
     public MsgLinuxCpuStateDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxCpuStateDepA, expected 32512, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxMemState.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxMemState.java
index 4a5c019963..95e5f24d9b 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxMemState.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxMemState.java
@@ -61,7 +61,9 @@ public MsgLinuxMemState() {
 
     public MsgLinuxMemState(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxMemState, expected 32521, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxMemStateDepA.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxMemStateDepA.java
index e0e0bf75e3..a86fc07b0c 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxMemStateDepA.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxMemStateDepA.java
@@ -55,7 +55,9 @@ public MsgLinuxMemStateDepA() {
 
     public MsgLinuxMemStateDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxMemStateDepA, expected 32513, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessFdCount.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessFdCount.java
index 2f11d529ea..34e05531fc 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessFdCount.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessFdCount.java
@@ -51,7 +51,9 @@ public MsgLinuxProcessFdCount() {
 
     public MsgLinuxProcessFdCount(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxProcessFdCount, expected 32518, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessFdSummary.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessFdSummary.java
index c93d44e39b..682a71264e 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessFdSummary.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessFdSummary.java
@@ -50,7 +50,10 @@ public MsgLinuxProcessFdSummary() {
 
     public MsgLinuxProcessFdSummary(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxProcessFdSummary, expected 32519, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessSocketCounts.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessSocketCounts.java
index be4a30c751..93f43d5eb1 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessSocketCounts.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessSocketCounts.java
@@ -64,7 +64,10 @@ public MsgLinuxProcessSocketCounts() {
 
     public MsgLinuxProcessSocketCounts(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxProcessSocketCounts, expected 32515, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessSocketQueues.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessSocketQueues.java
index 02ddc5ab73..af18bef681 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessSocketQueues.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxProcessSocketQueues.java
@@ -73,7 +73,10 @@ public MsgLinuxProcessSocketQueues() {
 
     public MsgLinuxProcessSocketQueues(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxProcessSocketQueues, expected 32516, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxSocketUsage.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxSocketUsage.java
index 484b1d9d7d..8685040a04 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxSocketUsage.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxSocketUsage.java
@@ -58,7 +58,9 @@ public MsgLinuxSocketUsage() {
 
     public MsgLinuxSocketUsage(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxSocketUsage, expected 32517, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxSysState.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxSysState.java
index f440c23478..c1b0bc140b 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxSysState.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxSysState.java
@@ -63,7 +63,9 @@ public MsgLinuxSysState() {
 
     public MsgLinuxSysState(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxSysState, expected 32522, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/linux/MsgLinuxSysStateDepA.java b/java/src/com/swiftnav/sbp/linux/MsgLinuxSysStateDepA.java
index 5f319549e3..12078662d9 100644
--- a/java/src/com/swiftnav/sbp/linux/MsgLinuxSysStateDepA.java
+++ b/java/src/com/swiftnav/sbp/linux/MsgLinuxSysStateDepA.java
@@ -57,7 +57,9 @@ public MsgLinuxSysStateDepA() {
 
     public MsgLinuxSysStateDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLinuxSysStateDepA, expected 32514, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/logging/MsgFwd.java b/java/src/com/swiftnav/sbp/logging/MsgFwd.java
index 9c1ad2815b..b187039021 100644
--- a/java/src/com/swiftnav/sbp/logging/MsgFwd.java
+++ b/java/src/com/swiftnav/sbp/logging/MsgFwd.java
@@ -55,7 +55,9 @@ public MsgFwd() {
 
     public MsgFwd(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFwd, expected 1026, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/logging/MsgLog.java b/java/src/com/swiftnav/sbp/logging/MsgLog.java
index c6ca49c692..5e05491e83 100644
--- a/java/src/com/swiftnav/sbp/logging/MsgLog.java
+++ b/java/src/com/swiftnav/sbp/logging/MsgLog.java
@@ -46,7 +46,9 @@ public MsgLog() {
 
     public MsgLog(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgLog, expected 1025, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/logging/MsgPrintDep.java b/java/src/com/swiftnav/sbp/logging/MsgPrintDep.java
index f489a9f0ba..1b0a85c884 100644
--- a/java/src/com/swiftnav/sbp/logging/MsgPrintDep.java
+++ b/java/src/com/swiftnav/sbp/logging/MsgPrintDep.java
@@ -42,7 +42,9 @@ public MsgPrintDep() {
 
     public MsgPrintDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPrintDep, expected 16, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/mag/MsgMagRaw.java b/java/src/com/swiftnav/sbp/mag/MsgMagRaw.java
index a1bc746718..4fa6ce7530 100644
--- a/java/src/com/swiftnav/sbp/mag/MsgMagRaw.java
+++ b/java/src/com/swiftnav/sbp/mag/MsgMagRaw.java
@@ -56,7 +56,9 @@ public MsgMagRaw() {
 
     public MsgMagRaw(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgMagRaw, expected 2306, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgAgeCorrections.java b/java/src/com/swiftnav/sbp/navigation/MsgAgeCorrections.java
index 1082a08f33..cb1e6339e3 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgAgeCorrections.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgAgeCorrections.java
@@ -45,7 +45,9 @@ public MsgAgeCorrections() {
 
     public MsgAgeCorrections(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAgeCorrections, expected 528, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgBaselineECEF.java b/java/src/com/swiftnav/sbp/navigation/MsgBaselineECEF.java
index a7b57f66c7..fe5f6f84fa 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgBaselineECEF.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgBaselineECEF.java
@@ -62,7 +62,9 @@ public MsgBaselineECEF() {
 
     public MsgBaselineECEF(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBaselineECEF, expected 523, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgBaselineECEFDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgBaselineECEFDepA.java
index 5772a0ca5b..41c235f7bb 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgBaselineECEFDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgBaselineECEFDepA.java
@@ -62,7 +62,9 @@ public MsgBaselineECEFDepA() {
 
     public MsgBaselineECEFDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBaselineECEFDepA, expected 514, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgBaselineHeadingDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgBaselineHeadingDepA.java
index bb94c79008..3035a29a97 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgBaselineHeadingDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgBaselineHeadingDepA.java
@@ -53,7 +53,9 @@ public MsgBaselineHeadingDepA() {
 
     public MsgBaselineHeadingDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBaselineHeadingDepA, expected 519, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgBaselineNED.java b/java/src/com/swiftnav/sbp/navigation/MsgBaselineNED.java
index 488f6f9775..13ad4eb1cd 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgBaselineNED.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgBaselineNED.java
@@ -66,7 +66,9 @@ public MsgBaselineNED() {
 
     public MsgBaselineNED(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBaselineNED, expected 524, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgBaselineNEDDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgBaselineNEDDepA.java
index 4d15e2e5b3..e27e113f0b 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgBaselineNEDDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgBaselineNEDDepA.java
@@ -66,7 +66,9 @@ public MsgBaselineNEDDepA() {
 
     public MsgBaselineNEDDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBaselineNEDDepA, expected 515, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgDops.java b/java/src/com/swiftnav/sbp/navigation/MsgDops.java
index f89ae5e36d..e0f42d6c7b 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgDops.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgDops.java
@@ -62,7 +62,9 @@ public MsgDops() {
 
     public MsgDops(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgDops, expected 520, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgDopsDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgDopsDepA.java
index 9bee2fe1fd..a3061c7d2e 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgDopsDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgDopsDepA.java
@@ -58,7 +58,9 @@ public MsgDopsDepA() {
 
     public MsgDopsDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgDopsDepA, expected 518, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgGPSTime.java b/java/src/com/swiftnav/sbp/navigation/MsgGPSTime.java
index 912417b530..d2b33f1774 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgGPSTime.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgGPSTime.java
@@ -59,7 +59,9 @@ public MsgGPSTime() {
 
     public MsgGPSTime(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGPSTime, expected 258, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgGPSTimeDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgGPSTimeDepA.java
index 1d1a902d9a..df7d74fd8e 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgGPSTimeDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgGPSTimeDepA.java
@@ -59,7 +59,9 @@ public MsgGPSTimeDepA() {
 
     public MsgGPSTimeDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGPSTimeDepA, expected 256, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgGPSTimeGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgGPSTimeGnss.java
index e5959a3853..332fd97fa0 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgGPSTimeGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgGPSTimeGnss.java
@@ -59,7 +59,9 @@ public MsgGPSTimeGnss() {
 
     public MsgGPSTimeGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGPSTimeGnss, expected 260, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosECEF.java b/java/src/com/swiftnav/sbp/navigation/MsgPosECEF.java
index a2d3626bea..5ccd9033c9 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosECEF.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosECEF.java
@@ -65,7 +65,9 @@ public MsgPosECEF() {
 
     public MsgPosECEF(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosECEF, expected 521, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosECEFCov.java b/java/src/com/swiftnav/sbp/navigation/MsgPosECEFCov.java
index 9a06290d09..2206acbd31 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosECEFCov.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosECEFCov.java
@@ -80,7 +80,9 @@ public MsgPosECEFCov() {
 
     public MsgPosECEFCov(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosECEFCov, expected 532, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosECEFCovGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgPosECEFCovGnss.java
index 56beb2bb23..14e67e2a8d 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosECEFCovGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosECEFCovGnss.java
@@ -80,7 +80,9 @@ public MsgPosECEFCovGnss() {
 
     public MsgPosECEFCovGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosECEFCovGnss, expected 564, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosECEFDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgPosECEFDepA.java
index 4b85680a1f..21aba2ba76 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosECEFDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosECEFDepA.java
@@ -65,7 +65,9 @@ public MsgPosECEFDepA() {
 
     public MsgPosECEFDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosECEFDepA, expected 512, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosECEFGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgPosECEFGnss.java
index 2eb0794c9f..4a4878b402 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosECEFGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosECEFGnss.java
@@ -65,7 +65,9 @@ public MsgPosECEFGnss() {
 
     public MsgPosECEFGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosECEFGnss, expected 553, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosLLH.java b/java/src/com/swiftnav/sbp/navigation/MsgPosLLH.java
index 90627aec24..8d966b55af 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosLLH.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosLLH.java
@@ -67,7 +67,9 @@ public MsgPosLLH() {
 
     public MsgPosLLH(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosLLH, expected 522, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHAcc.java b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHAcc.java
index 7e3d8cbbda..61c8ef3184 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHAcc.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHAcc.java
@@ -95,7 +95,9 @@ public MsgPosLLHAcc() {
 
     public MsgPosLLHAcc(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosLLHAcc, expected 536, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHCov.java b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHCov.java
index c3933e600a..f21fe3e4f9 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHCov.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHCov.java
@@ -80,7 +80,9 @@ public MsgPosLLHCov() {
 
     public MsgPosLLHCov(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosLLHCov, expected 529, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHCovGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHCovGnss.java
index 4f992ccf61..49c7a8a6ab 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHCovGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHCovGnss.java
@@ -80,7 +80,9 @@ public MsgPosLLHCovGnss() {
 
     public MsgPosLLHCovGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosLLHCovGnss, expected 561, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHDepA.java
index dfec934d07..4161708697 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHDepA.java
@@ -67,7 +67,9 @@ public MsgPosLLHDepA() {
 
     public MsgPosLLHDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosLLHDepA, expected 513, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHGnss.java
index 16db24ea83..9ae9ef51b7 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPosLLHGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPosLLHGnss.java
@@ -67,7 +67,9 @@ public MsgPosLLHGnss() {
 
     public MsgPosLLHGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPosLLHGnss, expected 554, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgPoseRelative.java b/java/src/com/swiftnav/sbp/navigation/MsgPoseRelative.java
index d696a27525..f82f1e193a 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgPoseRelative.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgPoseRelative.java
@@ -119,7 +119,9 @@ public MsgPoseRelative() {
 
     public MsgPoseRelative(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPoseRelative, expected 581, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgProtectionLevel.java b/java/src/com/swiftnav/sbp/navigation/MsgProtectionLevel.java
index f0afdf5021..a991d4823a 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgProtectionLevel.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgProtectionLevel.java
@@ -109,7 +109,9 @@ public MsgProtectionLevel() {
 
     public MsgProtectionLevel(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgProtectionLevel, expected 535, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgProtectionLevelDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgProtectionLevelDepA.java
index 22466ec2db..75d32ad46a 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgProtectionLevelDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgProtectionLevelDepA.java
@@ -62,7 +62,9 @@ public MsgProtectionLevelDepA() {
 
     public MsgProtectionLevelDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgProtectionLevelDepA, expected 534, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgReferenceFrameParam.java b/java/src/com/swiftnav/sbp/navigation/MsgReferenceFrameParam.java
index 93f9312e31..befb09fefc 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgReferenceFrameParam.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgReferenceFrameParam.java
@@ -94,7 +94,9 @@ public MsgReferenceFrameParam() {
 
     public MsgReferenceFrameParam(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgReferenceFrameParam, expected 580, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgUtcLeapSecond.java b/java/src/com/swiftnav/sbp/navigation/MsgUtcLeapSecond.java
index 2bfd7ad93d..bf2cee25bc 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgUtcLeapSecond.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgUtcLeapSecond.java
@@ -67,7 +67,9 @@ public MsgUtcLeapSecond() {
 
     public MsgUtcLeapSecond(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgUtcLeapSecond, expected 570, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgUtcTime.java b/java/src/com/swiftnav/sbp/navigation/MsgUtcTime.java
index 2c951ced25..4bbda02062 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgUtcTime.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgUtcTime.java
@@ -67,7 +67,9 @@ public MsgUtcTime() {
 
     public MsgUtcTime(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgUtcTime, expected 259, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgUtcTimeGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgUtcTimeGnss.java
index e0569e0538..1060ce47cc 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgUtcTimeGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgUtcTimeGnss.java
@@ -67,7 +67,9 @@ public MsgUtcTimeGnss() {
 
     public MsgUtcTimeGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgUtcTimeGnss, expected 261, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelBody.java b/java/src/com/swiftnav/sbp/navigation/MsgVelBody.java
index 07ab41fe6e..f8b29b1449 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelBody.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelBody.java
@@ -81,7 +81,9 @@ public MsgVelBody() {
 
     public MsgVelBody(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelBody, expected 531, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelCog.java b/java/src/com/swiftnav/sbp/navigation/MsgVelCog.java
index 8dcd53468f..a01ee776b0 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelCog.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelCog.java
@@ -70,7 +70,9 @@ public MsgVelCog() {
 
     public MsgVelCog(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelCog, expected 540, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelECEF.java b/java/src/com/swiftnav/sbp/navigation/MsgVelECEF.java
index 9f851574c1..3b2daf993c 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelECEF.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelECEF.java
@@ -61,7 +61,9 @@ public MsgVelECEF() {
 
     public MsgVelECEF(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelECEF, expected 525, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelECEFCov.java b/java/src/com/swiftnav/sbp/navigation/MsgVelECEFCov.java
index 62f862717e..47be7e7364 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelECEFCov.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelECEFCov.java
@@ -76,7 +76,9 @@ public MsgVelECEFCov() {
 
     public MsgVelECEFCov(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelECEFCov, expected 533, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelECEFCovGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgVelECEFCovGnss.java
index a542beb580..17466d4e3c 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelECEFCovGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelECEFCovGnss.java
@@ -76,7 +76,9 @@ public MsgVelECEFCovGnss() {
 
     public MsgVelECEFCovGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelECEFCovGnss, expected 565, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelECEFDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgVelECEFDepA.java
index b75e1545cb..acc2429a14 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelECEFDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelECEFDepA.java
@@ -61,7 +61,9 @@ public MsgVelECEFDepA() {
 
     public MsgVelECEFDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelECEFDepA, expected 516, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelECEFGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgVelECEFGnss.java
index 654eb1b9a2..050c6c9d9d 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelECEFGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelECEFGnss.java
@@ -61,7 +61,9 @@ public MsgVelECEFGnss() {
 
     public MsgVelECEFGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelECEFGnss, expected 557, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelNED.java b/java/src/com/swiftnav/sbp/navigation/MsgVelNED.java
index 75c17546e9..013916e127 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelNED.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelNED.java
@@ -65,7 +65,9 @@ public MsgVelNED() {
 
     public MsgVelNED(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelNED, expected 526, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelNEDCov.java b/java/src/com/swiftnav/sbp/navigation/MsgVelNEDCov.java
index e6ab3870b7..2efba9b218 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelNEDCov.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelNEDCov.java
@@ -79,7 +79,9 @@ public MsgVelNEDCov() {
 
     public MsgVelNEDCov(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelNEDCov, expected 530, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelNEDCovGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgVelNEDCovGnss.java
index 0265e7f549..450d59926c 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelNEDCovGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelNEDCovGnss.java
@@ -79,7 +79,9 @@ public MsgVelNEDCovGnss() {
 
     public MsgVelNEDCovGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelNEDCovGnss, expected 562, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelNEDDepA.java b/java/src/com/swiftnav/sbp/navigation/MsgVelNEDDepA.java
index 4ad96174e9..a397a8976a 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelNEDDepA.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelNEDDepA.java
@@ -65,7 +65,9 @@ public MsgVelNEDDepA() {
 
     public MsgVelNEDDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelNEDDepA, expected 517, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/navigation/MsgVelNEDGnss.java b/java/src/com/swiftnav/sbp/navigation/MsgVelNEDGnss.java
index b106eb89aa..2c69762a15 100644
--- a/java/src/com/swiftnav/sbp/navigation/MsgVelNEDGnss.java
+++ b/java/src/com/swiftnav/sbp/navigation/MsgVelNEDGnss.java
@@ -65,7 +65,9 @@ public MsgVelNEDGnss() {
 
     public MsgVelNEDGnss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgVelNEDGnss, expected 558, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ndb/MsgNdbEvent.java b/java/src/com/swiftnav/sbp/ndb/MsgNdbEvent.java
index 3ddc85d083..5c32e0a700 100644
--- a/java/src/com/swiftnav/sbp/ndb/MsgNdbEvent.java
+++ b/java/src/com/swiftnav/sbp/ndb/MsgNdbEvent.java
@@ -77,7 +77,9 @@ public MsgNdbEvent() {
 
     public MsgNdbEvent(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgNdbEvent, expected 1024, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgAlmanacGPS.java b/java/src/com/swiftnav/sbp/observation/MsgAlmanacGPS.java
index e9b4e67911..94f5e03f81 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgAlmanacGPS.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgAlmanacGPS.java
@@ -73,7 +73,9 @@ public MsgAlmanacGPS() {
 
     public MsgAlmanacGPS(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAlmanacGPS, expected 114, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgAlmanacGPSDep.java b/java/src/com/swiftnav/sbp/observation/MsgAlmanacGPSDep.java
index d7c322e22b..8ebaf0d2d9 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgAlmanacGPSDep.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgAlmanacGPSDep.java
@@ -73,7 +73,9 @@ public MsgAlmanacGPSDep() {
 
     public MsgAlmanacGPSDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAlmanacGPSDep, expected 112, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgAlmanacGlo.java b/java/src/com/swiftnav/sbp/observation/MsgAlmanacGlo.java
index a62e19f1d1..d5c7ae7470 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgAlmanacGlo.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgAlmanacGlo.java
@@ -66,7 +66,9 @@ public MsgAlmanacGlo() {
 
     public MsgAlmanacGlo(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAlmanacGlo, expected 115, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgAlmanacGloDep.java b/java/src/com/swiftnav/sbp/observation/MsgAlmanacGloDep.java
index eb90267550..edeb17ea20 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgAlmanacGloDep.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgAlmanacGloDep.java
@@ -66,7 +66,9 @@ public MsgAlmanacGloDep() {
 
     public MsgAlmanacGloDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAlmanacGloDep, expected 113, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgBasePosECEF.java b/java/src/com/swiftnav/sbp/observation/MsgBasePosECEF.java
index 6a7f677e07..54dca1a07a 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgBasePosECEF.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgBasePosECEF.java
@@ -52,7 +52,9 @@ public MsgBasePosECEF() {
 
     public MsgBasePosECEF(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBasePosECEF, expected 72, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgBasePosLLH.java b/java/src/com/swiftnav/sbp/observation/MsgBasePosLLH.java
index 8cc4dec4eb..6b62f57888 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgBasePosLLH.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgBasePosLLH.java
@@ -52,7 +52,9 @@ public MsgBasePosLLH() {
 
     public MsgBasePosLLH(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBasePosLLH, expected 68, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisBds.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisBds.java
index 0200bfe4b7..d51f764b97 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisBds.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisBds.java
@@ -120,7 +120,9 @@ public MsgEphemerisBds() {
 
     public MsgEphemerisBds(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisBds, expected 137, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepA.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepA.java
index 7516a52c13..60be47a2d0 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepA.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepA.java
@@ -118,7 +118,9 @@ public MsgEphemerisDepA() {
 
     public MsgEphemerisDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisDepA, expected 26, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepB.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepB.java
index c8b5c198ec..eebe39c935 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepB.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepB.java
@@ -121,7 +121,9 @@ public MsgEphemerisDepB() {
 
     public MsgEphemerisDepB(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisDepB, expected 70, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepC.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepC.java
index 0143cc682e..862e57ce84 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepC.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepC.java
@@ -129,7 +129,9 @@ public MsgEphemerisDepC() {
 
     public MsgEphemerisDepC(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisDepC, expected 71, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepD.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepD.java
index 6ff56c06a7..8cbc8fca0a 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepD.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisDepD.java
@@ -129,7 +129,9 @@ public MsgEphemerisDepD() {
 
     public MsgEphemerisDepD(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisDepD, expected 128, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPS.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPS.java
index ca1af39c25..64da8ab14d 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPS.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPS.java
@@ -111,7 +111,9 @@ public MsgEphemerisGPS() {
 
     public MsgEphemerisGPS(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGPS, expected 138, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPSDepE.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPSDepE.java
index 4db20b5b28..1c10d9cabf 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPSDepE.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPSDepE.java
@@ -111,7 +111,9 @@ public MsgEphemerisGPSDepE() {
 
     public MsgEphemerisGPSDepE(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGPSDepE, expected 129, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPSDepF.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPSDepF.java
index 570291b8e3..8df03c28ee 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPSDepF.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGPSDepF.java
@@ -110,7 +110,9 @@ public MsgEphemerisGPSDepF() {
 
     public MsgEphemerisGPSDepF(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGPSDepF, expected 134, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGal.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGal.java
index 9e819781ac..59825a5f6d 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGal.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGal.java
@@ -117,7 +117,9 @@ public MsgEphemerisGal() {
 
     public MsgEphemerisGal(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGal, expected 141, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGalDepA.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGalDepA.java
index d05f089a6e..d8ab96f3bd 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGalDepA.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGalDepA.java
@@ -113,7 +113,9 @@ public MsgEphemerisGalDepA() {
 
     public MsgEphemerisGalDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGalDepA, expected 149, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGlo.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGlo.java
index 2bf6ac74ac..7e96adf775 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGlo.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGlo.java
@@ -70,7 +70,9 @@ public MsgEphemerisGlo() {
 
     public MsgEphemerisGlo(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGlo, expected 139, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepA.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepA.java
index 6abf88b3b0..85294bbab9 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepA.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepA.java
@@ -61,7 +61,9 @@ public MsgEphemerisGloDepA() {
 
     public MsgEphemerisGloDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGloDepA, expected 131, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepB.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepB.java
index 3fbd09491d..4d174f4de3 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepB.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepB.java
@@ -61,7 +61,9 @@ public MsgEphemerisGloDepB() {
 
     public MsgEphemerisGloDepB(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGloDepB, expected 133, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepC.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepC.java
index f60a200172..f634681c85 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepC.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepC.java
@@ -67,7 +67,9 @@ public MsgEphemerisGloDepC() {
 
     public MsgEphemerisGloDepC(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGloDepC, expected 135, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepD.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepD.java
index 9f72995cf0..c64d18763f 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepD.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisGloDepD.java
@@ -69,7 +69,9 @@ public MsgEphemerisGloDepD() {
 
     public MsgEphemerisGloDepD(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisGloDepD, expected 136, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisQzss.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisQzss.java
index 20fd77c2d9..a3252c85b3 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisQzss.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisQzss.java
@@ -110,7 +110,9 @@ public MsgEphemerisQzss() {
 
     public MsgEphemerisQzss(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisQzss, expected 142, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbas.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbas.java
index efbb30c281..bdf036ea2a 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbas.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbas.java
@@ -51,7 +51,9 @@ public MsgEphemerisSbas() {
 
     public MsgEphemerisSbas(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisSbas, expected 140, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbasDepA.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbasDepA.java
index 349c2c2b41..59e1d268de 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbasDepA.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbasDepA.java
@@ -51,7 +51,9 @@ public MsgEphemerisSbasDepA() {
 
     public MsgEphemerisSbasDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisSbasDepA, expected 130, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbasDepB.java b/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbasDepB.java
index 3e34364ce4..80c1b289f3 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbasDepB.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgEphemerisSbasDepB.java
@@ -60,7 +60,9 @@ public MsgEphemerisSbasDepB() {
 
     public MsgEphemerisSbasDepB(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEphemerisSbasDepB, expected 132, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgGloBiases.java b/java/src/com/swiftnav/sbp/observation/MsgGloBiases.java
index a50dfe184f..bdc7dda36a 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgGloBiases.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgGloBiases.java
@@ -56,7 +56,9 @@ public MsgGloBiases() {
 
     public MsgGloBiases(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGloBiases, expected 117, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgGnssCapb.java b/java/src/com/swiftnav/sbp/observation/MsgGnssCapb.java
index 056774770e..cbeb041dd5 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgGnssCapb.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgGnssCapb.java
@@ -38,7 +38,9 @@ public MsgGnssCapb() {
 
     public MsgGnssCapb(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGnssCapb, expected 150, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgGroupDelay.java b/java/src/com/swiftnav/sbp/observation/MsgGroupDelay.java
index 46e9f68e8b..f9ab9b567d 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgGroupDelay.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgGroupDelay.java
@@ -58,7 +58,9 @@ public MsgGroupDelay() {
 
     public MsgGroupDelay(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGroupDelay, expected 148, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgGroupDelayDepA.java b/java/src/com/swiftnav/sbp/observation/MsgGroupDelayDepA.java
index 09933bfcb7..f078ab2a91 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgGroupDelayDepA.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgGroupDelayDepA.java
@@ -58,7 +58,9 @@ public MsgGroupDelayDepA() {
 
     public MsgGroupDelayDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGroupDelayDepA, expected 146, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgGroupDelayDepB.java b/java/src/com/swiftnav/sbp/observation/MsgGroupDelayDepB.java
index 9671618a4a..8c95bc5c5a 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgGroupDelayDepB.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgGroupDelayDepB.java
@@ -58,7 +58,9 @@ public MsgGroupDelayDepB() {
 
     public MsgGroupDelayDepB(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGroupDelayDepB, expected 147, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgIono.java b/java/src/com/swiftnav/sbp/observation/MsgIono.java
index 0173279fc6..072db54c4e 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgIono.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgIono.java
@@ -61,7 +61,9 @@ public MsgIono() {
 
     public MsgIono(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgIono, expected 144, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgObs.java b/java/src/com/swiftnav/sbp/observation/MsgObs.java
index 2623bed2f8..8fd5d80933 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgObs.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgObs.java
@@ -51,7 +51,9 @@ public MsgObs() {
 
     public MsgObs(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgObs, expected 74, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgObsDepA.java b/java/src/com/swiftnav/sbp/observation/MsgObsDepA.java
index e8109e5745..6997722634 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgObsDepA.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgObsDepA.java
@@ -47,7 +47,9 @@ public MsgObsDepA() {
 
     public MsgObsDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgObsDepA, expected 69, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgObsDepB.java b/java/src/com/swiftnav/sbp/observation/MsgObsDepB.java
index 539e30c499..f689e0ad9a 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgObsDepB.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgObsDepB.java
@@ -49,7 +49,9 @@ public MsgObsDepB() {
 
     public MsgObsDepB(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgObsDepB, expected 67, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgObsDepC.java b/java/src/com/swiftnav/sbp/observation/MsgObsDepC.java
index 8f314d3bf1..ddb62b16af 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgObsDepC.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgObsDepC.java
@@ -51,7 +51,9 @@ public MsgObsDepC() {
 
     public MsgObsDepC(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgObsDepC, expected 73, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgOsr.java b/java/src/com/swiftnav/sbp/observation/MsgOsr.java
index 70252f8090..1c5b84f44b 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgOsr.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgOsr.java
@@ -47,7 +47,9 @@ public MsgOsr() {
 
     public MsgOsr(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgOsr, expected 1600, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgSvAzEl.java b/java/src/com/swiftnav/sbp/observation/MsgSvAzEl.java
index 328bb35317..443fe4cccf 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgSvAzEl.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgSvAzEl.java
@@ -45,7 +45,9 @@ public MsgSvAzEl() {
 
     public MsgSvAzEl(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSvAzEl, expected 151, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/observation/MsgSvConfigurationGPSDep.java b/java/src/com/swiftnav/sbp/observation/MsgSvConfigurationGPSDep.java
index 6ae5a2284f..3e64a8b2f7 100644
--- a/java/src/com/swiftnav/sbp/observation/MsgSvConfigurationGPSDep.java
+++ b/java/src/com/swiftnav/sbp/observation/MsgSvConfigurationGPSDep.java
@@ -46,7 +46,9 @@ public MsgSvConfigurationGPSDep() {
 
     public MsgSvConfigurationGPSDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSvConfigurationGPSDep, expected 145, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/orientation/MsgAngularRate.java b/java/src/com/swiftnav/sbp/orientation/MsgAngularRate.java
index 970d0ac799..62c17551a1 100644
--- a/java/src/com/swiftnav/sbp/orientation/MsgAngularRate.java
+++ b/java/src/com/swiftnav/sbp/orientation/MsgAngularRate.java
@@ -60,7 +60,9 @@ public MsgAngularRate() {
 
     public MsgAngularRate(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAngularRate, expected 546, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/orientation/MsgBaselineHeading.java b/java/src/com/swiftnav/sbp/orientation/MsgBaselineHeading.java
index 8d3de8ff57..b0b8170c39 100644
--- a/java/src/com/swiftnav/sbp/orientation/MsgBaselineHeading.java
+++ b/java/src/com/swiftnav/sbp/orientation/MsgBaselineHeading.java
@@ -54,7 +54,9 @@ public MsgBaselineHeading() {
 
     public MsgBaselineHeading(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgBaselineHeading, expected 527, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/orientation/MsgOrientEuler.java b/java/src/com/swiftnav/sbp/orientation/MsgOrientEuler.java
index 698004cf30..3e3b109c3a 100644
--- a/java/src/com/swiftnav/sbp/orientation/MsgOrientEuler.java
+++ b/java/src/com/swiftnav/sbp/orientation/MsgOrientEuler.java
@@ -66,7 +66,9 @@ public MsgOrientEuler() {
 
     public MsgOrientEuler(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgOrientEuler, expected 545, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/orientation/MsgOrientQuat.java b/java/src/com/swiftnav/sbp/orientation/MsgOrientQuat.java
index 86ce73724f..065f53c4f4 100644
--- a/java/src/com/swiftnav/sbp/orientation/MsgOrientQuat.java
+++ b/java/src/com/swiftnav/sbp/orientation/MsgOrientQuat.java
@@ -72,7 +72,9 @@ public MsgOrientQuat() {
 
     public MsgOrientQuat(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgOrientQuat, expected 544, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgAlmanac.java b/java/src/com/swiftnav/sbp/piksi/MsgAlmanac.java
index 6c8eab1fd1..d568d5a98a 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgAlmanac.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgAlmanac.java
@@ -41,7 +41,9 @@ public MsgAlmanac() {
 
     public MsgAlmanac(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgAlmanac, expected 105, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgCellModemStatus.java b/java/src/com/swiftnav/sbp/piksi/MsgCellModemStatus.java
index 9de481f49f..c0a7475397 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgCellModemStatus.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgCellModemStatus.java
@@ -51,7 +51,9 @@ public MsgCellModemStatus() {
 
     public MsgCellModemStatus(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgCellModemStatus, expected 190, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgCommandOutput.java b/java/src/com/swiftnav/sbp/piksi/MsgCommandOutput.java
index 02ffb41a33..1e3ca95153 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgCommandOutput.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgCommandOutput.java
@@ -47,7 +47,9 @@ public MsgCommandOutput() {
 
     public MsgCommandOutput(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgCommandOutput, expected 188, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgCommandReq.java b/java/src/com/swiftnav/sbp/piksi/MsgCommandReq.java
index 04772961d0..a24e39663d 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgCommandReq.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgCommandReq.java
@@ -47,7 +47,9 @@ public MsgCommandReq() {
 
     public MsgCommandReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgCommandReq, expected 184, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgCommandResp.java b/java/src/com/swiftnav/sbp/piksi/MsgCommandResp.java
index 75de932fd8..91fb70b96e 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgCommandResp.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgCommandResp.java
@@ -47,7 +47,9 @@ public MsgCommandResp() {
 
     public MsgCommandResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgCommandResp, expected 185, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgCwResults.java b/java/src/com/swiftnav/sbp/piksi/MsgCwResults.java
index 51d70d6047..a2281f5c80 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgCwResults.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgCwResults.java
@@ -41,7 +41,9 @@ public MsgCwResults() {
 
     public MsgCwResults(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgCwResults, expected 192, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgCwStart.java b/java/src/com/swiftnav/sbp/piksi/MsgCwStart.java
index 455ff0c5de..6b991fa42c 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgCwStart.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgCwStart.java
@@ -41,7 +41,9 @@ public MsgCwStart() {
 
     public MsgCwStart(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgCwStart, expected 193, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgDeviceMonitor.java b/java/src/com/swiftnav/sbp/piksi/MsgDeviceMonitor.java
index e5e150e626..f6a832dc7d 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgDeviceMonitor.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgDeviceMonitor.java
@@ -56,7 +56,9 @@ public MsgDeviceMonitor() {
 
     public MsgDeviceMonitor(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgDeviceMonitor, expected 181, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgFrontEndGain.java b/java/src/com/swiftnav/sbp/piksi/MsgFrontEndGain.java
index db265193b9..e0be914e0e 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgFrontEndGain.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgFrontEndGain.java
@@ -52,7 +52,9 @@ public MsgFrontEndGain() {
 
     public MsgFrontEndGain(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgFrontEndGain, expected 191, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgIarState.java b/java/src/com/swiftnav/sbp/piksi/MsgIarState.java
index 0dda460224..c906751103 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgIarState.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgIarState.java
@@ -45,7 +45,9 @@ public MsgIarState() {
 
     public MsgIarState(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgIarState, expected 25, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgInitBaseDep.java b/java/src/com/swiftnav/sbp/piksi/MsgInitBaseDep.java
index 75c44515e3..7ddedd5383 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgInitBaseDep.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgInitBaseDep.java
@@ -40,7 +40,9 @@ public MsgInitBaseDep() {
 
     public MsgInitBaseDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgInitBaseDep, expected 35, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgMaskSatellite.java b/java/src/com/swiftnav/sbp/piksi/MsgMaskSatellite.java
index d8eba8eceb..89efc8e43a 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgMaskSatellite.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgMaskSatellite.java
@@ -47,7 +47,9 @@ public MsgMaskSatellite() {
 
     public MsgMaskSatellite(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgMaskSatellite, expected 43, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgMaskSatelliteDep.java b/java/src/com/swiftnav/sbp/piksi/MsgMaskSatelliteDep.java
index 02774a6ce9..20eb3f73cd 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgMaskSatelliteDep.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgMaskSatelliteDep.java
@@ -46,7 +46,9 @@ public MsgMaskSatelliteDep() {
 
     public MsgMaskSatelliteDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgMaskSatelliteDep, expected 27, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgNetworkBandwidthUsage.java b/java/src/com/swiftnav/sbp/piksi/MsgNetworkBandwidthUsage.java
index b2a9b65651..aad6e9f503 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgNetworkBandwidthUsage.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgNetworkBandwidthUsage.java
@@ -44,7 +44,9 @@ public MsgNetworkBandwidthUsage() {
 
     public MsgNetworkBandwidthUsage(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgNetworkBandwidthUsage, expected 189, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgNetworkStateReq.java b/java/src/com/swiftnav/sbp/piksi/MsgNetworkStateReq.java
index 6890aeb349..59e99a858c 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgNetworkStateReq.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgNetworkStateReq.java
@@ -41,7 +41,9 @@ public MsgNetworkStateReq() {
 
     public MsgNetworkStateReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgNetworkStateReq, expected 186, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgNetworkStateResp.java b/java/src/com/swiftnav/sbp/piksi/MsgNetworkStateResp.java
index 15b097c7c1..b082d5d7ec 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgNetworkStateResp.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgNetworkStateResp.java
@@ -66,7 +66,9 @@ public MsgNetworkStateResp() {
 
     public MsgNetworkStateResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgNetworkStateResp, expected 187, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgReset.java b/java/src/com/swiftnav/sbp/piksi/MsgReset.java
index 970cd5e89d..ee8fd280e3 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgReset.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgReset.java
@@ -43,7 +43,9 @@ public MsgReset() {
 
     public MsgReset(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgReset, expected 182, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgResetDep.java b/java/src/com/swiftnav/sbp/piksi/MsgResetDep.java
index d817c934bc..a1b94de086 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgResetDep.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgResetDep.java
@@ -40,7 +40,9 @@ public MsgResetDep() {
 
     public MsgResetDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgResetDep, expected 178, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgResetFilters.java b/java/src/com/swiftnav/sbp/piksi/MsgResetFilters.java
index 85bdffe818..51799457fc 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgResetFilters.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgResetFilters.java
@@ -44,7 +44,9 @@ public MsgResetFilters() {
 
     public MsgResetFilters(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgResetFilters, expected 34, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgSetTime.java b/java/src/com/swiftnav/sbp/piksi/MsgSetTime.java
index 9121a17aa2..f58a638fd8 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgSetTime.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgSetTime.java
@@ -40,7 +40,9 @@ public MsgSetTime() {
 
     public MsgSetTime(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSetTime, expected 104, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgSpecan.java b/java/src/com/swiftnav/sbp/piksi/MsgSpecan.java
index 625bba95c9..476854ba15 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgSpecan.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgSpecan.java
@@ -62,7 +62,9 @@ public MsgSpecan() {
 
     public MsgSpecan(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSpecan, expected 81, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgSpecanDep.java b/java/src/com/swiftnav/sbp/piksi/MsgSpecanDep.java
index 3648af79d9..9687686673 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgSpecanDep.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgSpecanDep.java
@@ -62,7 +62,9 @@ public MsgSpecanDep() {
 
     public MsgSpecanDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSpecanDep, expected 80, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgThreadState.java b/java/src/com/swiftnav/sbp/piksi/MsgThreadState.java
index 3ad4ca1468..e8c3527d7f 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgThreadState.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgThreadState.java
@@ -53,7 +53,9 @@ public MsgThreadState() {
 
     public MsgThreadState(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgThreadState, expected 23, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgUartState.java b/java/src/com/swiftnav/sbp/piksi/MsgUartState.java
index 9fa2a97207..c7c2109b10 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgUartState.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgUartState.java
@@ -60,7 +60,9 @@ public MsgUartState() {
 
     public MsgUartState(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgUartState, expected 29, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/piksi/MsgUartStateDepa.java b/java/src/com/swiftnav/sbp/piksi/MsgUartStateDepa.java
index aaee9c1084..54112f9229 100644
--- a/java/src/com/swiftnav/sbp/piksi/MsgUartStateDepa.java
+++ b/java/src/com/swiftnav/sbp/piksi/MsgUartStateDepa.java
@@ -52,7 +52,9 @@ public MsgUartStateDepa() {
 
     public MsgUartStateDepa(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgUartStateDepa, expected 24, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/sbas/MsgSbasRaw.java b/java/src/com/swiftnav/sbp/sbas/MsgSbasRaw.java
index fe0645d21c..ee324b041b 100644
--- a/java/src/com/swiftnav/sbp/sbas/MsgSbasRaw.java
+++ b/java/src/com/swiftnav/sbp/sbas/MsgSbasRaw.java
@@ -54,7 +54,9 @@ public MsgSbasRaw() {
 
     public MsgSbasRaw(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSbasRaw, expected 30583, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexDone.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexDone.java
index 2e19b107b6..8978831b5b 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexDone.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexDone.java
@@ -39,7 +39,10 @@ public MsgSettingsReadByIndexDone() {
 
     public MsgSettingsReadByIndexDone(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsReadByIndexDone, expected 166, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexReq.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexReq.java
index dd508d6c5d..e1605d72e7 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexReq.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexReq.java
@@ -43,7 +43,10 @@ public MsgSettingsReadByIndexReq() {
 
     public MsgSettingsReadByIndexReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsReadByIndexReq, expected 162, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexResp.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexResp.java
index 0c7ad92548..65a8c5037f 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexResp.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadByIndexResp.java
@@ -55,7 +55,10 @@ public MsgSettingsReadByIndexResp() {
 
     public MsgSettingsReadByIndexResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsReadByIndexResp, expected 167, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadReq.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadReq.java
index 1e6cf4b5d9..b2514b5d19 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadReq.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadReq.java
@@ -47,7 +47,9 @@ public MsgSettingsReadReq() {
 
     public MsgSettingsReadReq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsReadReq, expected 164, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadResp.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadResp.java
index 6edf7d1dea..a07ac520c8 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsReadResp.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsReadResp.java
@@ -48,7 +48,9 @@ public MsgSettingsReadResp() {
 
     public MsgSettingsReadResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsReadResp, expected 165, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsRegister.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsRegister.java
index 88e5331a3f..1e0e196d14 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsRegister.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsRegister.java
@@ -43,7 +43,9 @@ public MsgSettingsRegister() {
 
     public MsgSettingsRegister(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsRegister, expected 174, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsRegisterResp.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsRegisterResp.java
index 3a2aaeb02f..d12499ada0 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsRegisterResp.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsRegisterResp.java
@@ -50,7 +50,9 @@ public MsgSettingsRegisterResp() {
 
     public MsgSettingsRegisterResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsRegisterResp, expected 431, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsSave.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsSave.java
index 9ae09f13da..43af1b3412 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsSave.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsSave.java
@@ -40,7 +40,9 @@ public MsgSettingsSave() {
 
     public MsgSettingsSave(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsSave, expected 161, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsWrite.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsWrite.java
index 988549ccc5..77472fab32 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsWrite.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsWrite.java
@@ -48,7 +48,9 @@ public MsgSettingsWrite() {
 
     public MsgSettingsWrite(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsWrite, expected 160, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/settings/MsgSettingsWriteResp.java b/java/src/com/swiftnav/sbp/settings/MsgSettingsWriteResp.java
index 8522363f67..ed17cb7927 100644
--- a/java/src/com/swiftnav/sbp/settings/MsgSettingsWriteResp.java
+++ b/java/src/com/swiftnav/sbp/settings/MsgSettingsWriteResp.java
@@ -49,7 +49,9 @@ public MsgSettingsWriteResp() {
 
     public MsgSettingsWriteResp(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSettingsWriteResp, expected 175, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/signing/MsgEd25519Certificate.java b/java/src/com/swiftnav/sbp/signing/MsgEd25519Certificate.java
index 090a8aabbe..deb09994cf 100644
--- a/java/src/com/swiftnav/sbp/signing/MsgEd25519Certificate.java
+++ b/java/src/com/swiftnav/sbp/signing/MsgEd25519Certificate.java
@@ -45,7 +45,9 @@ public MsgEd25519Certificate() {
 
     public MsgEd25519Certificate(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEd25519Certificate, expected 3074, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/signing/MsgEd25519Signature.java b/java/src/com/swiftnav/sbp/signing/MsgEd25519Signature.java
index b0d2cc93b0..3801fd1b5b 100644
--- a/java/src/com/swiftnav/sbp/signing/MsgEd25519Signature.java
+++ b/java/src/com/swiftnav/sbp/signing/MsgEd25519Signature.java
@@ -57,7 +57,9 @@ public MsgEd25519Signature() {
 
     public MsgEd25519Signature(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEd25519Signature, expected 3075, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/signing/MsgEd25519SignatureDep.java b/java/src/com/swiftnav/sbp/signing/MsgEd25519SignatureDep.java
index aaf27c6986..cd9b7fd1d4 100644
--- a/java/src/com/swiftnav/sbp/signing/MsgEd25519SignatureDep.java
+++ b/java/src/com/swiftnav/sbp/signing/MsgEd25519SignatureDep.java
@@ -42,7 +42,9 @@ public MsgEd25519SignatureDep() {
 
     public MsgEd25519SignatureDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgEd25519SignatureDep, expected 3073, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/solution_meta/MsgSolnMeta.java b/java/src/com/swiftnav/sbp/solution_meta/MsgSolnMeta.java
index ad71addecf..4ebe22905a 100644
--- a/java/src/com/swiftnav/sbp/solution_meta/MsgSolnMeta.java
+++ b/java/src/com/swiftnav/sbp/solution_meta/MsgSolnMeta.java
@@ -84,7 +84,9 @@ public MsgSolnMeta() {
 
     public MsgSolnMeta(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSolnMeta, expected 65294, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/solution_meta/MsgSolnMetaDepA.java b/java/src/com/swiftnav/sbp/solution_meta/MsgSolnMetaDepA.java
index 4ccc6650be..bd6c10f389 100644
--- a/java/src/com/swiftnav/sbp/solution_meta/MsgSolnMetaDepA.java
+++ b/java/src/com/swiftnav/sbp/solution_meta/MsgSolnMetaDepA.java
@@ -87,7 +87,9 @@ public MsgSolnMetaDepA() {
 
     public MsgSolnMetaDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSolnMetaDepA, expected 65295, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrCodeBiases.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrCodeBiases.java
index dc95a01e40..72c414b773 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrCodeBiases.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrCodeBiases.java
@@ -62,7 +62,9 @@ public MsgSsrCodeBiases() {
 
     public MsgSsrCodeBiases(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrCodeBiases, expected 1505, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrCodePhaseBiasesBounds.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrCodePhaseBiasesBounds.java
index b1a9e8050f..3276d22669 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrCodePhaseBiasesBounds.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrCodePhaseBiasesBounds.java
@@ -48,7 +48,10 @@ public MsgSsrCodePhaseBiasesBounds() {
 
     public MsgSsrCodePhaseBiasesBounds(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrCodePhaseBiasesBounds, expected 1516, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrGridDefinitionDepA.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrGridDefinitionDepA.java
index e6dfe54571..a7fe51acb2 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrGridDefinitionDepA.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrGridDefinitionDepA.java
@@ -43,7 +43,10 @@ public MsgSsrGridDefinitionDepA() {
 
     public MsgSsrGridDefinitionDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrGridDefinitionDepA, expected 1525, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrection.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrection.java
index 98bbca3207..0171724460 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrection.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrection.java
@@ -55,7 +55,9 @@ public MsgSsrGriddedCorrection() {
 
     public MsgSsrGriddedCorrection(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrGriddedCorrection, expected 1532, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionBounds.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionBounds.java
index e6156c26f3..a936553b11 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionBounds.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionBounds.java
@@ -81,7 +81,10 @@ public MsgSsrGriddedCorrectionBounds() {
 
     public MsgSsrGriddedCorrectionBounds(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrGriddedCorrectionBounds, expected 1534, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionDepA.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionDepA.java
index 011fda2f7f..504b7d4d36 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionDepA.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionDepA.java
@@ -45,7 +45,10 @@ public MsgSsrGriddedCorrectionDepA() {
 
     public MsgSsrGriddedCorrectionDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrGriddedCorrectionDepA, expected 1530, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionNoStdDepA.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionNoStdDepA.java
index fb829acec6..1e9640b02e 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionNoStdDepA.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrGriddedCorrectionNoStdDepA.java
@@ -45,7 +45,10 @@ public MsgSsrGriddedCorrectionNoStdDepA() {
 
     public MsgSsrGriddedCorrectionNoStdDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrGriddedCorrectionNoStdDepA, expected 1520, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClock.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClock.java
index 9baa8dcac9..ed36d32c9f 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClock.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClock.java
@@ -88,7 +88,9 @@ public MsgSsrOrbitClock() {
 
     public MsgSsrOrbitClock(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrOrbitClock, expected 1501, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockBounds.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockBounds.java
index e61362d08d..6e19faeb25 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockBounds.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockBounds.java
@@ -60,7 +60,9 @@ public MsgSsrOrbitClockBounds() {
 
     public MsgSsrOrbitClockBounds(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrOrbitClockBounds, expected 1502, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockBoundsDegradation.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockBoundsDegradation.java
index 68ec1a9a1c..ad967a08b1 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockBoundsDegradation.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockBoundsDegradation.java
@@ -51,7 +51,10 @@ public MsgSsrOrbitClockBoundsDegradation() {
 
     public MsgSsrOrbitClockBoundsDegradation(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrOrbitClockBoundsDegradation, expected 1503, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockDepA.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockDepA.java
index b58411fb01..e5b719f1eb 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockDepA.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrOrbitClockDepA.java
@@ -79,7 +79,9 @@ public MsgSsrOrbitClockDepA() {
 
     public MsgSsrOrbitClockDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrOrbitClockDepA, expected 1500, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrPhaseBiases.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrPhaseBiases.java
index bc6134b74e..23fc6fc80e 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrPhaseBiases.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrPhaseBiases.java
@@ -76,7 +76,9 @@ public MsgSsrPhaseBiases() {
 
     public MsgSsrPhaseBiases(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrPhaseBiases, expected 1510, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrSatelliteApc.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrSatelliteApc.java
index 02c7a36990..5bcd377371 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrSatelliteApc.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrSatelliteApc.java
@@ -36,7 +36,9 @@ public MsgSsrSatelliteApc() {
 
     public MsgSsrSatelliteApc(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrSatelliteApc, expected 1540, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrection.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrection.java
index 9f4aed587e..cb0e445a7b 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrection.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrection.java
@@ -51,7 +51,9 @@ public MsgSsrStecCorrection() {
 
     public MsgSsrStecCorrection(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrStecCorrection, expected 1533, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrectionDep.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrectionDep.java
index db9b661bd4..28055c39c7 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrectionDep.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrectionDep.java
@@ -51,7 +51,9 @@ public MsgSsrStecCorrectionDep() {
 
     public MsgSsrStecCorrectionDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrStecCorrectionDep, expected 1531, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrectionDepA.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrectionDepA.java
index 9221b71e5a..4442345a08 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrectionDepA.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrStecCorrectionDepA.java
@@ -39,7 +39,10 @@ public MsgSsrStecCorrectionDepA() {
 
     public MsgSsrStecCorrectionDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrStecCorrectionDepA, expected 1515, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrTileDefinition.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrTileDefinition.java
index cb2918f393..0a39108a8e 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrTileDefinition.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrTileDefinition.java
@@ -124,7 +124,9 @@ public MsgSsrTileDefinition() {
 
     public MsgSsrTileDefinition(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrTileDefinition, expected 1527, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/ssr/MsgSsrTileDefinitionDep.java b/java/src/com/swiftnav/sbp/ssr/MsgSsrTileDefinitionDep.java
index 0d2c14c5b8..f3b0bdc73d 100644
--- a/java/src/com/swiftnav/sbp/ssr/MsgSsrTileDefinitionDep.java
+++ b/java/src/com/swiftnav/sbp/ssr/MsgSsrTileDefinitionDep.java
@@ -121,7 +121,9 @@ public MsgSsrTileDefinitionDep() {
 
     public MsgSsrTileDefinitionDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSsrTileDefinitionDep, expected 1526, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgCsacTelemetry.java b/java/src/com/swiftnav/sbp/system/MsgCsacTelemetry.java
index e7f7a76968..51661df8ca 100644
--- a/java/src/com/swiftnav/sbp/system/MsgCsacTelemetry.java
+++ b/java/src/com/swiftnav/sbp/system/MsgCsacTelemetry.java
@@ -47,7 +47,9 @@ public MsgCsacTelemetry() {
 
     public MsgCsacTelemetry(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgCsacTelemetry, expected 65284, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgCsacTelemetryLabels.java b/java/src/com/swiftnav/sbp/system/MsgCsacTelemetryLabels.java
index 0a0aee711b..982f01dd01 100644
--- a/java/src/com/swiftnav/sbp/system/MsgCsacTelemetryLabels.java
+++ b/java/src/com/swiftnav/sbp/system/MsgCsacTelemetryLabels.java
@@ -47,7 +47,9 @@ public MsgCsacTelemetryLabels() {
 
     public MsgCsacTelemetryLabels(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgCsacTelemetryLabels, expected 65285, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgDgnssStatus.java b/java/src/com/swiftnav/sbp/system/MsgDgnssStatus.java
index 31c46ba429..b45823fbb2 100644
--- a/java/src/com/swiftnav/sbp/system/MsgDgnssStatus.java
+++ b/java/src/com/swiftnav/sbp/system/MsgDgnssStatus.java
@@ -52,7 +52,9 @@ public MsgDgnssStatus() {
 
     public MsgDgnssStatus(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgDgnssStatus, expected 65282, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgGnssTimeOffset.java b/java/src/com/swiftnav/sbp/system/MsgGnssTimeOffset.java
index ed7156a79c..8be25fbb48 100644
--- a/java/src/com/swiftnav/sbp/system/MsgGnssTimeOffset.java
+++ b/java/src/com/swiftnav/sbp/system/MsgGnssTimeOffset.java
@@ -53,7 +53,9 @@ public MsgGnssTimeOffset() {
 
     public MsgGnssTimeOffset(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGnssTimeOffset, expected 65287, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgGroupMeta.java b/java/src/com/swiftnav/sbp/system/MsgGroupMeta.java
index 2bb29bdd2b..27a3da1d9d 100644
--- a/java/src/com/swiftnav/sbp/system/MsgGroupMeta.java
+++ b/java/src/com/swiftnav/sbp/system/MsgGroupMeta.java
@@ -55,7 +55,9 @@ public MsgGroupMeta() {
 
     public MsgGroupMeta(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgGroupMeta, expected 65290, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgHeartbeat.java b/java/src/com/swiftnav/sbp/system/MsgHeartbeat.java
index c0693ade89..65ec34de5c 100644
--- a/java/src/com/swiftnav/sbp/system/MsgHeartbeat.java
+++ b/java/src/com/swiftnav/sbp/system/MsgHeartbeat.java
@@ -48,7 +48,9 @@ public MsgHeartbeat() {
 
     public MsgHeartbeat(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgHeartbeat, expected 65535, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgInsStatus.java b/java/src/com/swiftnav/sbp/system/MsgInsStatus.java
index a39e98a319..5e4edfe9a2 100644
--- a/java/src/com/swiftnav/sbp/system/MsgInsStatus.java
+++ b/java/src/com/swiftnav/sbp/system/MsgInsStatus.java
@@ -43,7 +43,9 @@ public MsgInsStatus() {
 
     public MsgInsStatus(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgInsStatus, expected 65283, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgInsUpdates.java b/java/src/com/swiftnav/sbp/system/MsgInsUpdates.java
index de002ba0a3..4799acaac5 100644
--- a/java/src/com/swiftnav/sbp/system/MsgInsUpdates.java
+++ b/java/src/com/swiftnav/sbp/system/MsgInsUpdates.java
@@ -62,7 +62,9 @@ public MsgInsUpdates() {
 
     public MsgInsUpdates(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgInsUpdates, expected 65286, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgPpsTime.java b/java/src/com/swiftnav/sbp/system/MsgPpsTime.java
index cc3f58e46e..a13bca5d86 100644
--- a/java/src/com/swiftnav/sbp/system/MsgPpsTime.java
+++ b/java/src/com/swiftnav/sbp/system/MsgPpsTime.java
@@ -55,7 +55,9 @@ public MsgPpsTime() {
 
     public MsgPpsTime(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgPpsTime, expected 65288, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgSensorAidEvent.java b/java/src/com/swiftnav/sbp/system/MsgSensorAidEvent.java
index 593f78456b..59b6992c12 100644
--- a/java/src/com/swiftnav/sbp/system/MsgSensorAidEvent.java
+++ b/java/src/com/swiftnav/sbp/system/MsgSensorAidEvent.java
@@ -65,7 +65,9 @@ public MsgSensorAidEvent() {
 
     public MsgSensorAidEvent(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgSensorAidEvent, expected 65289, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgStartup.java b/java/src/com/swiftnav/sbp/system/MsgStartup.java
index fd5bcda313..5fa9e3bfc8 100644
--- a/java/src/com/swiftnav/sbp/system/MsgStartup.java
+++ b/java/src/com/swiftnav/sbp/system/MsgStartup.java
@@ -50,7 +50,9 @@ public MsgStartup() {
 
     public MsgStartup(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgStartup, expected 65280, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgStatusJournal.java b/java/src/com/swiftnav/sbp/system/MsgStatusJournal.java
index c316d5d5b0..e4dbf413c4 100644
--- a/java/src/com/swiftnav/sbp/system/MsgStatusJournal.java
+++ b/java/src/com/swiftnav/sbp/system/MsgStatusJournal.java
@@ -59,7 +59,9 @@ public MsgStatusJournal() {
 
     public MsgStatusJournal(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgStatusJournal, expected 65533, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/system/MsgStatusReport.java b/java/src/com/swiftnav/sbp/system/MsgStatusReport.java
index 50157662ef..48026f88bd 100644
--- a/java/src/com/swiftnav/sbp/system/MsgStatusReport.java
+++ b/java/src/com/swiftnav/sbp/system/MsgStatusReport.java
@@ -60,7 +60,9 @@ public MsgStatusReport() {
 
     public MsgStatusReport(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgStatusReport, expected 65534, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/tracking/MsgMeasurementState.java b/java/src/com/swiftnav/sbp/tracking/MsgMeasurementState.java
index 4a6bf5861d..0e87117611 100644
--- a/java/src/com/swiftnav/sbp/tracking/MsgMeasurementState.java
+++ b/java/src/com/swiftnav/sbp/tracking/MsgMeasurementState.java
@@ -45,7 +45,9 @@ public MsgMeasurementState() {
 
     public MsgMeasurementState(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgMeasurementState, expected 97, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/tracking/MsgTrackingIq.java b/java/src/com/swiftnav/sbp/tracking/MsgTrackingIq.java
index 1b9cbbe5dd..0e2808155a 100644
--- a/java/src/com/swiftnav/sbp/tracking/MsgTrackingIq.java
+++ b/java/src/com/swiftnav/sbp/tracking/MsgTrackingIq.java
@@ -50,7 +50,9 @@ public MsgTrackingIq() {
 
     public MsgTrackingIq(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgTrackingIq, expected 45, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/tracking/MsgTrackingIqDepA.java b/java/src/com/swiftnav/sbp/tracking/MsgTrackingIqDepA.java
index 6f30f8bf73..acd316b5ae 100644
--- a/java/src/com/swiftnav/sbp/tracking/MsgTrackingIqDepA.java
+++ b/java/src/com/swiftnav/sbp/tracking/MsgTrackingIqDepA.java
@@ -50,7 +50,9 @@ public MsgTrackingIqDepA() {
 
     public MsgTrackingIqDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgTrackingIqDepA, expected 28, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/tracking/MsgTrackingIqDepB.java b/java/src/com/swiftnav/sbp/tracking/MsgTrackingIqDepB.java
index b25cd68767..1180c98c86 100644
--- a/java/src/com/swiftnav/sbp/tracking/MsgTrackingIqDepB.java
+++ b/java/src/com/swiftnav/sbp/tracking/MsgTrackingIqDepB.java
@@ -50,7 +50,9 @@ public MsgTrackingIqDepB() {
 
     public MsgTrackingIqDepB(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgTrackingIqDepB, expected 44, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/tracking/MsgTrackingState.java b/java/src/com/swiftnav/sbp/tracking/MsgTrackingState.java
index 9c9dee27ab..b605e0be82 100644
--- a/java/src/com/swiftnav/sbp/tracking/MsgTrackingState.java
+++ b/java/src/com/swiftnav/sbp/tracking/MsgTrackingState.java
@@ -45,7 +45,9 @@ public MsgTrackingState() {
 
     public MsgTrackingState(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgTrackingState, expected 65, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDepA.java b/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDepA.java
index 0c29192c49..d66a067447 100644
--- a/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDepA.java
+++ b/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDepA.java
@@ -44,7 +44,9 @@ public MsgTrackingStateDepA() {
 
     public MsgTrackingStateDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgTrackingStateDepA, expected 22, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDepB.java b/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDepB.java
index 0fb8eef8da..ab52e2fa72 100644
--- a/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDepB.java
+++ b/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDepB.java
@@ -44,7 +44,9 @@ public MsgTrackingStateDepB() {
 
     public MsgTrackingStateDepB(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgTrackingStateDepB, expected 19, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDetailedDep.java b/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDetailedDep.java
index cb1835875b..d3f1bd9a4d 100644
--- a/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDetailedDep.java
+++ b/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDetailedDep.java
@@ -118,7 +118,10 @@ public MsgTrackingStateDetailedDep() {
 
     public MsgTrackingStateDetailedDep(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgTrackingStateDetailedDep, expected 17, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDetailedDepA.java b/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDetailedDepA.java
index 60888ee4aa..a25910741c 100644
--- a/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDetailedDepA.java
+++ b/java/src/com/swiftnav/sbp/tracking/MsgTrackingStateDetailedDepA.java
@@ -119,7 +119,10 @@ public MsgTrackingStateDetailedDepA() {
 
     public MsgTrackingStateDetailedDepA(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgTrackingStateDetailedDepA, expected 33, actual "
+                            + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/user/MsgUserData.java b/java/src/com/swiftnav/sbp/user/MsgUserData.java
index df9de7df7d..e73025b0f8 100644
--- a/java/src/com/swiftnav/sbp/user/MsgUserData.java
+++ b/java/src/com/swiftnav/sbp/user/MsgUserData.java
@@ -44,7 +44,9 @@ public MsgUserData() {
 
     public MsgUserData(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgUserData, expected 2048, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/vehicle/MsgOdometry.java b/java/src/com/swiftnav/sbp/vehicle/MsgOdometry.java
index ec0a86d6e3..4741768aef 100644
--- a/java/src/com/swiftnav/sbp/vehicle/MsgOdometry.java
+++ b/java/src/com/swiftnav/sbp/vehicle/MsgOdometry.java
@@ -58,7 +58,9 @@ public MsgOdometry() {
 
     public MsgOdometry(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgOdometry, expected 2307, actual " + msg.type);
     }
 
     @Override
diff --git a/java/src/com/swiftnav/sbp/vehicle/MsgWheeltick.java b/java/src/com/swiftnav/sbp/vehicle/MsgWheeltick.java
index bc64c3e966..33b97853bf 100644
--- a/java/src/com/swiftnav/sbp/vehicle/MsgWheeltick.java
+++ b/java/src/com/swiftnav/sbp/vehicle/MsgWheeltick.java
@@ -68,7 +68,9 @@ public MsgWheeltick() {
 
     public MsgWheeltick(SBPMessage msg) throws SBPBinaryException {
         super(msg);
-        assert msg.type == TYPE;
+        if (msg.type != TYPE)
+            throw new SBPBinaryException(
+                    "Type mismatch for MsgWheeltick, expected 2308, actual " + msg.type);
     }
 
     @Override