diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
index bcb2ca442..42dd1c95c 100644
--- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
@@ -121,7 +121,7 @@ public class DNSHelper {
 					while (p > 0) {
 						p -= s.get(i++).getPriority();
 					}
-					i--;
+					if (i>0) i--;
 					// remove is expensive, but we have only a few entries
 					// anyway
 					SRV srv = s.remove(i);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 25db8ecca..1351226ba 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -204,7 +204,7 @@ public class XmppConnection implements Runnable {
 					&& "nosrv".equals(result.getString("error", null))) {
 				socket = new Socket(account.getServer().getDomainpart(), 5222);
 			} else {
-				throw new IOException("timeout in dns");
+				throw new IOException("unhandled exception in DNS resolver");
 			}
 			final OutputStream out = socket.getOutputStream();
 			tagWriter.setOutputStream(out);