diff --git a/ChangeLog b/ChangeLog
index 6c6969ed..a19f0579 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Anything we add/remove/fix/change is in here (even our rants)
 Fish (F), Mark (M), DeadNotBuried (D)
 ===============================================================================
 * NeoStats * Version 3.0.a4-dev
+ - Maybe a Fix for NEO-364 (F)
  - Implement Timeouts for CURL (NEO-380) (F)
  - StatServ GeoIP was using gethostbyname_r which isn't needed (F)
  - Fix ServiceRoot Validate Function and RootNick validate Function (F)
diff --git a/src/dns.c b/src/dns.c
index 64be253b..b9274ab4 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -328,6 +328,8 @@ void canx_dns(Module *modptr)
 			list_delete_destroy_node( dnslist, dnsnode );
 			dnsnode = lnode2;
 		}
+		if (dnsnode == NULL) 
+			continue;
 		dnsnode = list_next(dnslist, dnsnode);
 	}
 	dnsnode = list_first(dnsqueue);