diff --git a/CHANGELOG b/CHANGELOG
index ed4d2168e..4e5bec769 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE] Fixed a bug in rpc-grind.nse that would cause unresponsive UDP
+  ports to be wrongly marked open. This was reported by Christopher
+  Clements. [David Fifield]
+
 o [Ncat] Close connection endpoint when receiving EOF on stdin. [Michal Hlavinka].
 
 o Fixed interface listing on NetBSD. The bug was first noticed by
diff --git a/scripts/rpc-grind.nse b/scripts/rpc-grind.nse
index 38506879f..c02dcda50 100644
--- a/scripts/rpc-grind.nse
+++ b/scripts/rpc-grind.nse
@@ -88,8 +88,8 @@ local isRPC = function(host, port)
         end
 
         -- And check response
-        _, data = rpcConn:ReceivePacket()
-        if not data then
+        status, data = rpcConn:ReceivePacket()
+        if not status then
             stdnse.print_debug("%s: isRPC didn't receive response.", SCRIPT_NAME)
             return
         else