diff --git a/core/java/src/net/i2p/crypto/CryptixAESEngine.java b/core/java/src/net/i2p/crypto/CryptixAESEngine.java
index 35a2d37e61ed5d3137e96a4f364d7e70310b631b..a5af3c2082a27244a8fe0308188711226247ffab 100644
--- a/core/java/src/net/i2p/crypto/CryptixAESEngine.java
+++ b/core/java/src/net/i2p/crypto/CryptixAESEngine.java
@@ -81,8 +81,14 @@ public class CryptixAESEngine extends AESEngine {
      */
     @Override
     public void encrypt(byte payload[], int payloadIndex, byte out[], int outIndex, SessionKey sessionKey, byte iv[], int ivOffset, int length) {
-        if ( (payload == null) || (out == null) || (sessionKey == null) || (iv == null) ) 
-            throw new NullPointerException("invalid args to aes");
+        if (payload == null) 
+            throw new NullPointerException("invalid args to aes - payload");
+        if (out == null)
+            throw new NullPointerException("invalid args to aes - out");
+        if (sessionKey == null)
+            throw new NullPointerException("invalid args to aes - sessionKey");
+        if (iv == null) 
+            throw new NullPointerException("invalid args to aes - iv");
         if (payload.length < payloadIndex + length)
             throw new IllegalArgumentException("Payload is too short");
         if (out.length < outIndex + length)
diff --git a/router/java/src/net/i2p/router/transport/ntcp/Writer.java b/router/java/src/net/i2p/router/transport/ntcp/Writer.java
index 3d01bfc9dd125da7f18104e9892338b09f2b679d..8ec823e56e282c203e09520ec668b7be264c06f5 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/Writer.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/Writer.java
@@ -128,7 +128,7 @@ class Writer {
                         _prepBuffer.init();
                         con.prepareNextWrite(_prepBuffer);
                     } catch (RuntimeException re) {
-                        _log.log(Log.CRIT, "Error in the ntcp writer", re);
+                        _log.log(Log.CRIT, "Error in the ntcp writer on " + con, re);
                     }
                 }
             }