diff --git a/nselib/stun.lua b/nselib/stun.lua
index 00084f642..ce03c2904 100644
--- a/nselib/stun.lua
+++ b/nselib/stun.lua
@@ -132,7 +132,9 @@ Attribute = {
 		local function parseAddress(data, pos)
 			local _, addr = nil, {}
 			pos, _, addr.family, addr.port, addr.ip = bin.unpack("<CCSI", data, pos)
-			addr.ip = ipOps.fromdword(addr.ip)
+			if ( addr.ip ) then
+				addr.ip = ipOps.fromdword(addr.ip)
+			end
 			return addr
 		end
 		
diff --git a/scripts/stun-version.nse b/scripts/stun-version.nse
index 635e41114..2c834b3dc 100644
--- a/scripts/stun-version.nse
+++ b/scripts/stun-version.nse
@@ -37,5 +37,5 @@ action = function(host, port)
 	port.version.name = "stun"
 	port.version.product = result
 	nmap.set_port_state(host, port, "open")
-    nmap.set_port_version(host, port, "hardmatched")
+	nmap.set_port_version(host, port, "hardmatched")
 end