diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java
index 6b7d17ca6..e75843f2a 100644
--- a/src/main/java/eu/siacs/conversations/utils/Resolver.java
+++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java
@@ -276,10 +276,6 @@ public class Resolver {
         try {
             result = executor.invokeAny(r);
             executor.shutdown();
-            if (result == null) {
-                Log.i(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball unable to connect to one address");
-                return null;
-            }
             Thread disconnector = new Thread(() -> {
                 while (true) {
                     try {
@@ -299,7 +295,7 @@ public class Resolver {
             Log.e(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball failed: ", e);
             return null;
         } catch (ExecutionException e) {
-            Log.e(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball failed: ", e);
+            Log.i(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball unable to connect to one address");
             return null;
         }
     }
@@ -437,7 +433,7 @@ public class Resolver {
             if (this.socket != null && this.socket.isConnected()) {
 	        return this ;
             }
-            return null;
+            throw new Exception("Resolver.Result was not possible to connect - should be catched by executor");
         }
 
         public ContentValues toContentValues() {