diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
index afa22de9d..331ee3dad 100644
--- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
@@ -70,9 +70,12 @@ public class MessagePayloadMessage extends I2CPMessageImpl {
         }
     }
 
+    /**
+     *  @throws UnsupportedOperationException always
+     */
     @Override
     protected byte[] doWriteMessage() throws I2CPMessageException, IOException {
-        throw new RuntimeException("go away, we dont want any");
+        throw new UnsupportedOperationException();
     }
     
     /**
diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
index ef0e94194..67a67ffa4 100644
--- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
@@ -101,9 +101,12 @@ public class SendMessageMessage extends I2CPMessageImpl {
         }
     }
 
+    /**
+     *  @throws UnsupportedOperationException always
+     */
     @Override
     protected byte[] doWriteMessage() throws I2CPMessageException, IOException {
-        throw new RuntimeException("wtf, dont run me");
+        throw new UnsupportedOperationException();
     }
 
     /**