diff --git a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java
index f239987de..9b98417a1 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java
@@ -1316,11 +1316,13 @@ public class POP3MailBox implements NewMailListener {
 			if (socket != null && socket.isConnected()) {
 				try {
 					deletePending(!shouldWait);
-					if (shouldWait) {
-						sendCmd1a("QUIT");
-						if (_log.shouldDebug()) _log.debug("close() with wait complete");
-					} else {
-						sendCmd1aNoWait("QUIT");
+					if (socket != null && socket.isConnected()) {
+						if (shouldWait) {
+							sendCmd1a("QUIT");
+							if (_log.shouldDebug()) _log.debug("close() with wait complete");
+						} else {
+							sendCmd1aNoWait("QUIT");
+						}
 					}
 				} catch (IOException e) {
 					//if (_log.shouldDebug()) _log.debug("error closing: " + e);
diff --git a/history.txt b/history.txt
index 60401f0f0..ebf9e4383 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,11 @@
+2018-06-21 zzz
+ * Console: Add Azerbaijani
+ * SusiMail: Fix NPE on logout (ticket #2266)
+
 2018-06-19 zzz
+ * Console:
+   - Restore line breaks in copy/pasted logs (ticket #2078)
+   - Don't show individual tx/rx graphs if showing combined graph (ticket #2106)
  * SSU: Set volatile on field (ticket #2260)
 
 2018-06-17 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 601535dbe..a85b0c8aa 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 = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 21;
+    public final static long BUILD = 22;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";