diff --git a/src/server.c b/src/server.c
index c9e22c6..d6cf7ef 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3416,9 +3416,6 @@
 		case RSLV_UPD_SRVIP_NOT_FOUND:
 			goto save_ip;
 
-		case RSLV_UPD_CNAME:
-			goto invalid;
-
 		case RSLV_UPD_NO_IP_FOUND:
 			has_no_ip = 1;
 			goto update_status;
@@ -3426,9 +3423,11 @@
 		case RSLV_UPD_NAME_ERROR:
 			/* update resolution status to OTHER error type */
 			resolution->status = RSLV_STATUS_OTHER;
+			has_no_ip = 1;
 			goto update_status;
 
 		default:
+			has_no_ip = 1;
 			goto invalid;
 
 	}
@@ -3453,7 +3452,8 @@
 		counters->invalid++;
 		goto update_status;
 	}
-	snr_update_srv_status(s, has_no_ip);
+	if (!snr_update_srv_status(s, has_no_ip) && has_no_ip)
+		memset(&s->addr, 0, sizeof(s->addr));
 	return 0;
 }