diff --git a/router/java/src/net/i2p/router/peermanager/PeerProfile.java b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
index ec2e094d354b906869aeff35fac4bb922fc23a1b..0ec790c34b73188ddf26a623d84cc1ca42a30a96 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerProfile.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
@@ -41,10 +41,10 @@ public class PeerProfile {
     // periodic rates
     //private RateStat _sendSuccessSize = null;
     //private RateStat _receiveSize = null;
-    private RateStat _dbResponseTime = null;
-    private RateStat _tunnelCreateResponseTime = null;
-    private RateStat _tunnelTestResponseTime = null;
-    private RateStat _dbIntroduction = null;
+    private RateStat _dbResponseTime;
+    private RateStat _tunnelCreateResponseTime;
+    private RateStat _tunnelTestResponseTime;
+    private RateStat _dbIntroduction;
     // calculation bonuses
     private long _speedBonus;
     private long _capacityBonus;
@@ -80,16 +80,22 @@ public class PeerProfile {
         _bigCountries.addAll(Arrays.asList(big));
     }
 
+    /**
+     *  @param peer non-null
+     */
     public PeerProfile(RouterContext context, Hash peer) {
         this(context, peer, true);
     }
 
     /**
+     *  @param peer non-null
      *  @param expand must be true (see below)
      */
-    public PeerProfile(RouterContext context, Hash peer, boolean expand) {
+    private PeerProfile(RouterContext context, Hash peer, boolean expand) {
         _context = context;
         _log = context.logManager().getLog(PeerProfile.class);
+        if (peer == null)
+            throw new NullPointerException();
         _peer = peer;
         // this is always true, and there are several places in the router that will NPE
         // if it is false, so all need to be fixed before we can have non-expanded profiles
@@ -102,7 +108,7 @@ public class PeerProfile {
             _distance = 0;
     }
     
-    /** what peer is being profiled */
+    /** what peer is being profiled, non-null */
     public Hash getPeer() { return _peer; }
     
     /**
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
index 1edfbe45d1b326561c18edfdcd9dfc0b279c0d8f..a224f576ac93e4eda765f09356cfe41879eb30a2 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
@@ -184,7 +184,6 @@ public class ProfileOrganizer {
         if (profile == null) return null;
 
         Hash peer = profile.getPeer();
-        if (peer == null) return null;
 
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("New profile created for " + peer);