diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java
index d50ca617d7..4d38c72df2 100644
--- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java
+++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java
@@ -268,7 +268,7 @@ abstract class DnsResolveContext<T> {
     // guards against loops in the cache but early return once a loop is detected.
     //
     // Visible for testing only
-    static String cnameResolveFromCache(DnsCnameCache cnameCache, String name) {
+    static String cnameResolveFromCache(DnsCnameCache cnameCache, String name) throws UnknownHostException {
         String first = cnameCache.get(hostnameWithDot(name));
         if (first == null) {
             // Nothing in the cache at all
@@ -281,15 +281,12 @@ abstract class DnsResolveContext<T> {
             return first;
         }
 
-        if (first.equals(second)) {
-            // Loop detected.... early return.
-            return first;
-        }
-
-        return cnameResolveFromCacheLoop(cnameCache, first, second);
+        checkCnameLoop(name, first, second);
+        return cnameResolveFromCacheLoop(cnameCache, name, first, second);
     }
 
-    static String cnameResolveFromCacheLoop(DnsCnameCache cnameCache, String first, String mapping) {
+    private static String cnameResolveFromCacheLoop(
+            DnsCnameCache cnameCache, String hostname, String first, String mapping) throws UnknownHostException {
         // Detect loops by advance only every other iteration.
         // See https://en.wikipedia.org/wiki/Cycle_detection#Floyd's_Tortoise_and_Hare
         boolean advance = false;
@@ -297,10 +294,7 @@ abstract class DnsResolveContext<T> {
         String name = mapping;
         // Resolve from cnameCache() until there is no more cname entry cached.
         while ((mapping = cnameCache.get(hostnameWithDot(name))) != null) {
-            if (first.equals(mapping)) {
-                // Follow CNAME from cache would loop. Lets break here.
-                break;
-            }
+            checkCnameLoop(hostname, first, mapping);
             name = mapping;
             if (advance) {
                 first = cnameCache.get(first);
@@ -310,9 +304,20 @@ abstract class DnsResolveContext<T> {
         return name;
     }
 
+    private static void checkCnameLoop(String hostname, String first, String second) throws UnknownHostException {
+        if (first.equals(second)) {
+            // Follow CNAME from cache would loop. Lets throw and so fail the resolution.
+            throw new UnknownHostException("CNAME loop detected for '" + hostname + '\'');
+        }
+    }
     private void internalResolve(String name, Promise<List<T>> promise) {
-        // Resolve from cnameCache() until there is no more cname entry cached.
-        name = cnameResolveFromCache(cnameCache(), name);
+        try {
+            // Resolve from cnameCache() until there is no more cname entry cached.
+            name = cnameResolveFromCache(cnameCache(), name);
+        } catch (Throwable cause) {
+            promise.tryFailure(cause);
+            return;
+        }
 
         try {
             DnsServerAddressStream nameServerAddressStream = getNameServers(name);
@@ -977,11 +982,11 @@ abstract class DnsResolveContext<T> {
 
     private void followCname(DnsQuestion question, String cname, DnsQueryLifecycleObserver queryLifecycleObserver,
                              Promise<List<T>> promise) {
-        cname = cnameResolveFromCache(cnameCache(), cname);
-        DnsServerAddressStream stream = getNameServers(cname);
-
         final DnsQuestion cnameQuestion;
+        final DnsServerAddressStream stream;
         try {
+            cname = cnameResolveFromCache(cnameCache(), cname);
+            stream = getNameServers(cname);
             cnameQuestion = new DefaultDnsQuestion(cname, question.type(), dnsClass);
         } catch (Throwable cause) {
             queryLifecycleObserver.queryFailed(cause);
diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsResolveContextTest.java b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsResolveContextTest.java
index 70c2cce4e5..30c7fc9b78 100644
--- a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsResolveContextTest.java
+++ b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsResolveContextTest.java
@@ -18,6 +18,10 @@ package io.netty.resolver.dns;
 import io.netty.channel.embedded.EmbeddedChannel;
 import org.junit.Test;
 
+import java.net.UnknownHostException;
+
+import static org.junit.Assert.fail;
+
 public class DnsResolveContextTest {
 
     private static final String HOSTNAME = "netty.io.";
@@ -25,7 +29,12 @@ public class DnsResolveContextTest {
     @Test
     public void testCnameLoop() {
         for (int i = 1; i < 128; i++) {
-            DnsResolveContext.cnameResolveFromCache(buildCache(i), HOSTNAME);
+            try {
+                DnsResolveContext.cnameResolveFromCache(buildCache(i), HOSTNAME);
+                fail();
+            } catch (UnknownHostException expected) {
+                // expected
+            }
         }
     }