diff --git a/CHANGELOG b/CHANGELOG
index 9293f52cb..c30f4cf4b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,8 @@ o [GH#1451] Nmap now performs forward DNS lookups in parallel, using the same
   took just over an hour. The previous system took 49 hours for the same data
   set! [Daniel Miller]
 
+o [GH#2784] Various bug fixes in the mssql NSE library [johnjaylward, nnposter]
+
 Nmap 7.95 [2024-04-23]
 
 o Integrated over 4,000 of your IPv4 OS fingerprints. Added 336 signatures,
diff --git a/nselib/mssql.lua b/nselib/mssql.lua
index ba7a94346..94a74dd7a 100644
--- a/nselib/mssql.lua
+++ b/nselib/mssql.lua
@@ -2740,9 +2740,9 @@ Helper =
   DiscoverByTcp = function( host, port )
     local version, instance, status
     -- Check to see if we've already discovered an instance on this port
-    local instance = Helper.GetDiscoveredInstances(host, port)
-    if instance then
-      return true, {instance}
+    local instances = Helper.GetDiscoveredInstances(host, port)
+    if instances then
+      return true, instances
     end
     instance =  SqlServerInstanceInfo:new()
     instance.host = host
@@ -3227,8 +3227,8 @@ Helper =
     Helper.Discover( host )
 
     if ( port ) then
-      local status, instances = Helper.GetDiscoveredInstances(host, port)
-      if status then
+      local instances = Helper.GetDiscoveredInstances(host, port)
+      if instances then
         return true, instances
       else
         return false, "No SQL Server instance detected on this port"