diff --git a/src/switch_nat.c b/src/switch_nat.c
index 3fc746703e..eb0701a69e 100644
--- a/src/switch_nat.c
+++ b/src/switch_nat.c
@@ -69,11 +69,13 @@ static switch_status_t get_upnp_pubaddr(char *pub_addr)
 	if (UPNP_GetExternalIPAddress(nat_globals.urls.controlURL,
 								   nat_globals.data.servicetype,
 								   pub_addr) == UPNPCOMMAND_SUCCESS) {
-		if (!strcmp(pub_addr, "0.0.0.0") || switch_strlen_zero(pub_addr)) {
+		if (!strcmp(pub_addr, "0.0.0.0") || switch_strlen_zero_buf(pub_addr)) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 
 							  "uPNP Device (url: %s) returned an invalid external address of '%s'.  Disabling uPNP\n", nat_globals.urls.controlURL, pub_addr);
 			return SWITCH_STATUS_GENERR;
 		}
+	} else {
+		return SWITCH_STATUS_GENERR;
 	}
 	return SWITCH_STATUS_SUCCESS;
 }