diff --git a/src/ChangeLog b/src/ChangeLog
index 8ad1382d..0cdf77b3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2009-06-15  Micah Cowan  <micah@cowan.name>
 
+	* ftp.c (getftp): If we can't accept the connection, return
+	CONERROR, not whatever the contents of err happens to be. Fixes
+	bug #25015.
+
 	* retr.c (fd_read_body): Make both args to progress_create
 	consistent, resulting in an accurate progress display. Fixes bug
 	#24948.
diff --git a/src/ftp.c b/src/ftp.c
index 171a38a4..8e05a796 100644
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -945,7 +945,7 @@ Error in server response, closing control connection.\n"));
       if (dtsock < 0)
         {
           logprintf (LOG_NOTQUIET, "accept: %s\n", strerror (errno));
-          return err;
+          return CONERROR;
         }
     }