Index: /trunk/pdns/pdns/lwres.cc
===================================================================
--- /trunk/pdns/pdns/lwres.cc	(revision 1476)
+++ /trunk/pdns/pdns/lwres.cc	(revision 1492)
@@ -1,5 +1,5 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002 - 2009 PowerDNS.COM BV
+    Copyright (C) 2002 - 2010 PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -175,8 +175,8 @@
 
     if(!pdns_iequals(domain, mdp.d_qname)) { 
-      if(domain.find((char)0)==string::npos) {// embedded nulls are too noisy
+      if(!mdp.d_qname.empty() && domain.find((char)0) == string::npos) {// embedded nulls are too noisy, plus empty domains are too
         L<<Logger::Notice<<"Packet purporting to come from remote server "<<ip.toString()<<" contained wrong answer: '" << domain << "' != '" << mdp.d_qname << "'" << endl;
-        g_stats.unexpectedCount++;
       }
+      g_stats.unexpectedCount++;
       goto out;
     }