diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java
index d0abe06efdac40bfff9b047f5cdc03426d249339..43bb9a7122ea121615b0646a2c096e1a20931e43 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java
@@ -178,6 +178,7 @@ class PeerConnectionIn implements Runnable
                 ps.extensionMessage(id, payload);
                 if (_log.shouldLog(Log.DEBUG)) 
                     _log.debug("Received extension message from " + peer + " on " + peer.metainfo.getName());
+                break;
               default:
                 byte[] bs = new byte[i-1];
                 din.readFully(bs);
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
index 66399aa3408011fdf9ddf31919c5239c97efe792..38cb29e3b445dcae98e8589a59690af494b02c88 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
@@ -543,9 +543,8 @@ class PeerConnectionOut implements Runnable
     m.type = Message.EXTENSION;
     m.piece = id;
     m.data = bytes;
-    m.begin = 0;
-    m.length = bytes.length;
+    m.off = 0;
+    m.len = bytes.length;
     addMessage(m);
-
   }
 }
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
index 4db84ad686e49832bcb4991344e771c4aa5a6048..0c3c9eee888646aeefebefb40072b191eb9ab94b 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
@@ -493,7 +493,10 @@ class PeerState implements DataLoader
               Map map = bev.getMap();
               if (_log.shouldLog(Log.DEBUG))
                   _log.debug("Got extension handshake message " + bev.toString());
-          } catch (Exception e) {}
+          } catch (Exception e) {
+              if (_log.shouldLog(Log.DEBUG))
+                  _log.debug("Failed extension decode", e);
+          }
       } else {
           if (_log.shouldLog(Log.DEBUG))
               _log.debug("Got extended message type: " + id + " length: " + bs.length);