diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileImpl.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileImpl.java
index f803f3cd866f9e5e006c098714c9d8a0411d5ff0..dafe680e5b57c92ffd297760e6c9daac6d91b959 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileImpl.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileImpl.java
@@ -82,7 +82,11 @@ public class FtpFileImpl extends AbstractFtpFile
         } catch (IOException ioex)
         {
             content.close();
-            return null;
+            throw ioex;
+        } catch (RuntimeException re)
+        {
+            content.close();
+            throw re;
         }
     }