diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
index 331ee3dad85ed0d53b285f08681602214012aba2..6d0c4daacca96a22f8e35235598e14a64ee1900b 100644
--- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
@@ -96,7 +96,7 @@ public class MessagePayloadMessage extends I2CPMessageImpl {
         int size = 2 + 4 + 4 + _payload.getSize();
         try {
             DataHelper.writeLong(out, 4, size);
-            DataHelper.writeLong(out, 1, getType());
+            DataHelper.writeLong(out, 1, MESSAGE_TYPE);
             DataHelper.writeLong(out, 2, _sessionId);
             DataHelper.writeLong(out, 4, _messageId);
             DataHelper.writeLong(out, 4, _payload.getSize());
diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
index d9122bd778cd00d0323ec5d9dcc77ee5bf7cdeba..dd4f4305411dd8f981592c3e7e7a6bb2ccea6c9d 100644
--- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
@@ -308,7 +308,7 @@ public class MessageStatusMessage extends I2CPMessageImpl {
         
         try {
             DataHelper.writeLong(out, 4, len);
-            DataHelper.writeLong(out, 1, getType());
+            DataHelper.writeLong(out, 1, MESSAGE_TYPE);
             DataHelper.writeLong(out, 2, _sessionId);
             DataHelper.writeLong(out, 4, _messageId);
             DataHelper.writeLong(out, 1, _status);
diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
index 032c1ea8be18ef95070e285813686962b91007e1..cc685cbab26a7f3cbab1792254abebaa4b9e7b92 100644
--- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
@@ -76,7 +76,7 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl {
         
         try {
             DataHelper.writeLong(out, 4, len);
-            DataHelper.writeLong(out, 1, getType());
+            DataHelper.writeLong(out, 1, MESSAGE_TYPE);
             DataHelper.writeLong(out, 2, _sessionId);
             DataHelper.writeLong(out, 4, _messageId);
         } catch (DataFormatException dfe) {
diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
index 67a67ffa4722aada3d2f691c97d8049fa61bebf1..37e5ea5f15c8ac89bc5f99ba379eccc5f3bf4226 100644
--- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
@@ -74,7 +74,7 @@ public class SendMessageMessage extends I2CPMessageImpl {
 
     @Override
     protected void doReadMessage(InputStream in, int size) throws I2CPMessageException, IOException {
-        if (true) throw new IllegalStateException("wtf, do not run me");
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -84,8 +84,8 @@ public class SendMessageMessage extends I2CPMessageImpl {
      */
     @Override
     public void readMessage(InputStream in, int length, int type) throws I2CPMessageException, IOException {
-        if (type != getType())
-            throw new I2CPMessageException("Invalid message type (found: " + type + " supported: " + getType()
+        if (type != MESSAGE_TYPE)
+            throw new I2CPMessageException("Invalid message type (found: " + type + " supported: " + MESSAGE_TYPE
                                            + " class: " + getClass().getName() + ")");
         if (length < 0) throw new IOException("Negative payload size");
 
@@ -129,7 +129,7 @@ public class SendMessageMessage extends I2CPMessageImpl {
         
         try {
             DataHelper.writeLong(out, 4, len);
-            DataHelper.writeLong(out, 1, getType());
+            DataHelper.writeLong(out, 1, MESSAGE_TYPE);
             _sessionId.writeBytes(out);
             _destination.writeBytes(out);
             _payload.writeBytes(out);