diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/FtpPullJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/FtpPullJob.php
index 1fa6c6bc88..e0afd5e2c1 100644
--- a/lib/Alchemy/Phrasea/TaskManager/Job/FtpPullJob.php
+++ b/lib/Alchemy/Phrasea/TaskManager/Job/FtpPullJob.php
@@ -94,8 +94,8 @@ class FtpPullJob extends AbstractJob
         }
 
         $ftp = $app['phraseanet.ftp.client']($host, $port, 90, $ssl, $proxy, $proxyport);
-        $ftp->passive($passive);
         $ftp->login($user, $password);
+        $ftp->passive($passive);
         $ftp->chdir($ftpPath);
         $list_1 = $ftp->list_directory(true);
 
diff --git a/lib/classes/ftpclient.php b/lib/classes/ftpclient.php
index 405ffc3309..b3d051fd04 100644
--- a/lib/classes/ftpclient.php
+++ b/lib/classes/ftpclient.php
@@ -401,6 +401,10 @@ class ftpclient
         $current_dir = $this->pwd();
         $contents = ftp_rawlist($this->connexion, $current_dir,  ! ! $recursive);
 
+        if($contents === false){
+            throw new Exception('Vérifier les paramètres ftp ou mettre en mode passive');
+        }
+
         $list = [];
 
         foreach ($contents as $content) {