From 0904500398d2c0ef49f998ce9c1a8c80d90aef86 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 12 Mar 2016 13:43:45 +0000
Subject: [PATCH] Susimail: Fix NPE

---
 apps/susimail/src/src/i2p/susi/webmail/WebMail.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 53ef8fd4f..34c5213ce 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -1138,9 +1138,15 @@ public class WebMail extends HttpServlet
 			sessionObject.info = _t("Configuration reloaded");
 		}
 		if( buttonPressed( request, REFRESH ) ) {
+			POP3MailBox mailbox = sessionObject.mailbox;
+			if (mailbox == null) {
+				sessionObject.error += _t("Internal error, lost connection.") + '\n';
+				sessionObject.state = STATE_AUTH;
+				return;
+			}
 			// TODO how to do a "No new mail" message?
-			sessionObject.mailbox.refresh();
-			sessionObject.error += sessionObject.mailbox.lastError();
+			mailbox.refresh();
+			sessionObject.error += mailbox.lastError();
 			sessionObject.mailCache.getMail(MailCache.FetchMode.HEADER);
 			// get through cache so we have the disk-only ones too
 			String[] uidls = sessionObject.mailCache.getUIDLs();