diff --git a/CHANGELOG b/CHANGELOG
index 605b46a61..297fdcfd1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE][GH#1111] Fix a script crash in ftp.lua when PASV connection timed out.
+  [Aniket Pandey]
+
 o [NSE][GH#1114] Update bitcoin-getaddr to receive more than one response
   message, since the first message usually only has one address in it. [h43z]
 
diff --git a/nselib/ftp.lua b/nselib/ftp.lua
index 828715418..fc4d0519d 100644
--- a/nselib/ftp.lua
+++ b/nselib/ftp.lua
@@ -276,7 +276,7 @@ function pasv(socket, buffer)
     end
   else
     if not code or code >= 300 then
-      return nil, ("PASV failed: %d %s"):format(code or "socket", message)
+      return nil, ("PASV failed: %s %s"):format(code or "socket", message)
     end
     -- Compute the PASV port as given by the server
     -- The server should answer with something like