diff --git a/history.txt b/history.txt
index d23c92ccb..5a5d55007 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2012-10-19 zzz
+ * UDP: Fix peer test NPE (ticket # 748)
+
 2012-10-18 kytv
 * Portuguese and Spanish updates from Transifex
  * Update geoip.txt based on Maxmind GeoLite Country database from 2012-10-02
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index ea17ad55f..421ff4f63 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 15;
+    public final static long BUILD = 16;
 
     /** for example "-test" */
-    public final static String EXTRA = "";
+    public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
index 9b00962b3..ce5760474 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
@@ -734,7 +734,13 @@ class PeerTestManager {
                 return;
             }
             UDPAddress addr = new UDPAddress(raddr);
-            SessionKey charlieIntroKey = new SessionKey(addr.getIntroKey());
+            byte[] ikey - addr.getIntroKey();
+            if (ikey == null) {
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Unable to pick a charlie");
+                return;
+            }
+            SessionKey charlieIntroKey = new SessionKey(ikey);
             
             //UDPPacket packet = _packetBuilder.buildPeerTestToAlice(aliceIP, from.getPort(), aliceIntroKey, charlieIntroKey, nonce);
             //_transport.send(packet);