diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
index 9b34239e5..f0004b520 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
@@ -109,13 +109,9 @@ public class HostAddress {
     }
 
     public String getErrorMessage() {
-        String error;
         if (exception == null) {
-            error = "No error logged";
+            return "No error logged";
         }
-        else {
-            error = exception.getMessage();
-        }
-        return toString() + " Exception: " + error;
+        return "'" + toString() + "' failed because " + exception.toString();
     }
 }
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java b/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java
index ec6013a8f..498a17cb9 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java
@@ -41,7 +41,7 @@ public class SmackExceptionTest {
 
         ConnectionException connectionException = ConnectionException.from(failedAddresses);
         String message = connectionException.getMessage();
-        assertEquals("The following addresses failed: foo.bar.example:1234 Exception: Failed for some reason, barz.example:5678 Exception: Failed for some other reason",
+        assertEquals("The following addresses failed: 'foo.bar.example:1234' failed because java.lang.Exception: Failed for some reason, 'barz.example:5678' failed because java.lang.Exception: Failed for some other reason",
                         message);
     }