diff --git a/CHANGELOG b/CHANGELOG
index 36247c40d..aa70c957b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o A crash caused by an incorrect test condition was fixed. It would
+  happen when running a ping scan other than a protocol ping, without
+  debugging enabled, if an ICMP packet was received referring to a
+  packet that was not TCP, UDP, or ICMP. Thanks to Brandon Enright and
+  Matt Castelein for reporting the problem. [David]
+
 o [Zenmap] The keyboard shortcut for "Save to Directory" has been
   changed from Ctrl+v to Ctrl+Alt+s so as not to conflict with the
   usual paste shortcut [Jah, Michael].
diff --git a/scan_engine.cc b/scan_engine.cc
index a892227a7..fcd4186e0 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -4315,7 +4315,8 @@ static int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
           /* Did we fail to find a probe? */
           if (probenum >= listsz)
             continue;
-        } else if (o.debugging && !USI->ptech.rawprotoscan) {
+        } else if (!USI->ptech.rawprotoscan) {
+          if (o.debugging)
             error("Got ICMP response to a packet which was not TCP, UDP, or ICMP");
           continue;
         }