diff --git a/scheme/ftpd/ftpd.scm b/scheme/ftpd/ftpd.scm
index c142915..31277e7 100644
--- a/scheme/ftpd/ftpd.scm
+++ b/scheme/ftpd/ftpd.scm
@@ -884,6 +884,7 @@
 (define (handle-port stuff)
   (log-command (syslog-level info) "PORT" stuff)
   (ensure-authenticated-login)
+  (maybe-close-data-connection)
   (call-with-values
    (lambda () (ftpd-parse-port-arg stuff))
    (lambda (address port)
@@ -914,6 +915,7 @@
 (define (handle-pasv stuff)
   (log-command (syslog-level info) "PASV")
   (ensure-authenticated-login)
+  (maybe-close-data-connection)
   (let ((socket (create-socket protocol-family/internet
 			       socket-type/stream)))
     
@@ -951,8 +953,6 @@
        (socket-address->internet-address 
 	(socket-local-address socket)))
      (lambda (host-address control-port)
-       (log (syslog-level debug) "Closing ~A ~A"
-	    (socket:inport socket) (socket:outport socket))
        (close-socket socket)
        host-address))))
 
@@ -1305,7 +1305,6 @@
 
 (define (signal-error! code message)
   (replace-reply! code message)
-  (maybe-close-data-connection)
   (signal 'ftpd-error code message))
 
 (define (register-reply! code . messages)