diff --git a/history.txt b/history.txt
index 0c7acf0a25..c01cc4755f 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2023-01-08 zzz
+ * AppArmor: Allow classes.jsa in other locations
+ * SSU:
+   - Fix NPE handling SSU1 peer test msg 7
+   - Build fix for Java 7
+
 2023-01-03 zzz
  * Console: Add link to sort netdb country chart by count
 
diff --git a/installer/resources/checklist.md b/installer/resources/checklist.md
index 1dd527ba76..61e4b8cc0e 100644
--- a/installer/resources/checklist.md
+++ b/installer/resources/checklist.md
@@ -35,8 +35,8 @@
   with a recent Oracle JDK (12+), and fix any issues.
   Oracle JDK will error on things that OpenJDK does not!
 
-- Java 7 test: 'ant mavenCentral.deps' to ensure
-  that Android will build correcly; fix any issues
+- Java 7 test: 'ant mavenCentral.deps' with a Java 7 bootclasspath in override.properties
+  to ensure that Android will build correcly; fix any issues
 
 
 ## A day or two before
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index b9f86d25e4..a4b4ca39e5 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Git";
     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 = "-rc";
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index c739e4ea29..8ca88d8510 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -1736,12 +1736,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         Long id = Long.valueOf(peer.getRcvConnID());
         PeerStateDestroyed oldPSD;
         synchronized(_addDropLock) {
-            if (_recentlyClosedConnIDs.containsKey(id)){
-                oldPSD = _recentlyClosedConnIDs.put(id, peer);
-                oldPSD = _recentlyClosedConnIDs.get(id);
-            }else{
-                oldPSD = _recentlyClosedConnIDs.get(id);
-            }
+            oldPSD = _recentlyClosedConnIDs.put(id, peer);
+            if (oldPSD != null)
+                _recentlyClosedConnIDs.put(id, oldPSD); // put the old one back
         }
         if (oldPSD != null)
             peer.kill();
@@ -1933,15 +1930,12 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 PeerState2 state2 = (PeerState2) oldPeer;
                 Long id = Long.valueOf(state2.getRcvConnID());
                 PeerStateDestroyed newPSD = new PeerStateDestroyed(_context, this, state2);
-                PeerStateDestroyed oldPSD;
-                if (_recentlyClosedConnIDs.containsKey(id)){
-                    oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
-                    oldPSD = _recentlyClosedConnIDs.get(id);
-                }else{
-                    oldPSD = _recentlyClosedConnIDs.get(id);
-                }
-                if (oldPSD != null)
+                PeerStateDestroyed oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
+                if (oldPSD != null) {
+                    // put the old one back, kill new one
+                    _recentlyClosedConnIDs.put(id, oldPSD);
                     newPSD.kill();
+                }
                 _peersByConnID.remove(id);
             }
         }
@@ -2198,15 +2192,12 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             PeerState2 state2 = (PeerState2) peer;
             Long id = Long.valueOf(state2.getRcvConnID());
             PeerStateDestroyed newPSD = new PeerStateDestroyed(_context, this, state2);
-            PeerStateDestroyed oldPSD;
-            if (_recentlyClosedConnIDs.containsKey(id)){
-                oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
-                oldPSD = _recentlyClosedConnIDs.get(id);
-            }else{
-                oldPSD = _recentlyClosedConnIDs.get(id);
-            }
-            if (oldPSD != null)
+            PeerStateDestroyed oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
+            if (oldPSD != null) {
+                // put the old one back, kill new one
+                _recentlyClosedConnIDs.put(id, oldPSD);
                 newPSD.kill();
+            }
             _peersByConnID.remove(id);
         }