RAZ-3223: FTP issues
-  Tweaked for better error catching