diff --git a/scripts/http-enum.nse b/scripts/http-enum.nse
index 8a226bda7..19716c80d 100644
--- a/scripts/http-enum.nse
+++ b/scripts/http-enum.nse
@@ -53,7 +53,7 @@ require 'stdnse'
 
 -- List of fingerprint files
 local fingerprint_files = { "http-fingerprints", "yokoso-fingerprints" }
-if(nmap.registry.args.fingerprints ~= nil) then
+if(nmap and nmap.registry and nmap.registry.args and nmap.registry.args.fingerprints ~= nil) then
 	fingerprint_files = { nmap.registry.args.fingerprints }
 end
 
diff --git a/scripts/script.db b/scripts/script.db
index 4590a8fb8..969b27f43 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -15,6 +15,7 @@ Entry { filename = "html-title.nse", categories = { "default", "discovery", "saf
 Entry { filename = "http-auth.nse", categories = { "auth", "default", "intrusive", } }
 Entry { filename = "http-date.nse", categories = { "discovery", "safe", } }
 Entry { filename = "http-enum.nse", categories = { "discovery", "intrusive", "vuln", } }
+Entry { filename = "http-headers.nse", categories = { "discovery", } }
 Entry { filename = "http-iis-webdav-vuln.nse", categories = { "intrusive", "vuln", } }
 Entry { filename = "http-open-proxy.nse", categories = { "default", "discovery", "external", "intrusive", } }
 Entry { filename = "http-passwd.nse", categories = { "intrusive", "vuln", } }