diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
index c2b17f30e..d59a53c3c 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
@@ -676,7 +676,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
         sslSocket.startHandshake();
 
         final HostnameVerifier verifier = getConfiguration().getHostnameVerifier();
-        if (verifier != null && !verifier.verify(getServiceName(), sslSocket.getSession())) {
+        if (verifier == null) {
+                throw new IllegalStateException("No HostnameVerifier set. Use connectionConfiguration.setHostnameVerifier() to configure.");
+        } else if (!verifier.verify(getServiceName(), sslSocket.getSession())) {
             throw new CertificateException("Hostname verification of certificate failed. Certificate does not authenticate " + getServiceName());
         }