diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 1549aeb5d..04c0f625e 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -360,7 +360,8 @@ public class XmppConnection implements Runnable {
 										String.valueOf(saslMechanism.getPriority()));
 								tagReader.reset();
 								sendStartStream();
-								if (tagReader.readTag().isStart("stream")) {
+								final Tag tag = tagReader.readTag();
+								if (tag != null && tag.isStart("stream")) {
 									processStream();
 								} else {
 									throw new IOException("server didn't restart stream after successful auth");
@@ -647,7 +648,8 @@ public class XmppConnection implements Runnable {
 			sendStartStream();
 			Log.d(Config.LOGTAG, account.getJid().toBareJid()+ ": TLS connection established");
 			features.encryptionEnabled = true;
-			if (tagReader.readTag().isStart("stream")) {
+			final Tag tag = tagReader.readTag();
+			if (tag != null && tag.isStart("stream")) {
 				processStream();
 			} else {
 				throw new IOException("server didn't restart stream after STARTTLS");