diff --git a/router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java b/router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java
index c67cd71c3..a2dec7770 100644
--- a/router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java
+++ b/router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java
@@ -76,6 +76,8 @@ public class HandleTunnelMessageJob extends JobImpl {
             return;
         }
 
+        info.messageProcessed();
+        
         info = getUs(info);
         if (info == null) {
             if (_log.shouldLog(Log.ERROR))
@@ -284,7 +286,7 @@ public class HandleTunnelMessageJob extends JobImpl {
     }
     
     private void sendToLocal(I2NPMessage body) {
-        InNetMessage msg = new InNetMessage();
+        InNetMessage msg = new InNetMessage(_context);
         msg.setMessage(body);
         msg.setFromRouter(_from);
         msg.setFromRouterHash(_fromHash);
@@ -480,7 +482,7 @@ public class HandleTunnelMessageJob extends JobImpl {
                     _log.info("Message for tunnel " + _info.getTunnelId() + 
                               " received at the gateway (us), but its a 0 length tunnel though it is a " 
                               + _body.getClass().getName() + ", so process it locally");
-                InNetMessage msg = new InNetMessage();
+                InNetMessage msg = new InNetMessage(HandleLocallyJob.this._context);
                 msg.setFromRouter(_from);
                 msg.setFromRouterHash(_fromHash);
                 msg.setMessage(_body);
diff --git a/router/java/src/net/i2p/router/message/MessageHandler.java b/router/java/src/net/i2p/router/message/MessageHandler.java
index 0307f2722..22f059680 100644
--- a/router/java/src/net/i2p/router/message/MessageHandler.java
+++ b/router/java/src/net/i2p/router/message/MessageHandler.java
@@ -100,7 +100,7 @@ class MessageHandler {
     
     private void handleLocalRouter(I2NPMessage message, RouterIdentity from, Hash fromHash, SourceRouteBlock replyBlock, boolean ackUsed) {
         _log.info("Handle " + message.getClass().getName() + " to a local router - toss it on the inbound network pool");
-        InNetMessage msg = new InNetMessage();
+        InNetMessage msg = new InNetMessage(_context);
         msg.setFromRouter(from);
         msg.setFromRouterHash(fromHash);
         msg.setMessage(message);
diff --git a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java
index 8421b556f..bb7c78d4e 100644
--- a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java
+++ b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java
@@ -145,7 +145,7 @@ public class SendMessageDirectJob extends JobImpl {
             if (_onSend != null)
                 _context.jobQueue().addJob(_onSend);
 
-            InNetMessage msg = new InNetMessage();
+            InNetMessage msg = new InNetMessage(_context);
             msg.setFromRouter(_router.getIdentity());
             msg.setMessage(_message);
             _context.inNetMessagePool().add(msg);