1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 886af8a2..2cfd36c2 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -475,8 +475,10 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
                          "INCOMINGDIR",
                          _("You must specify a directory in the configuration"
                            " in section `%s' under `%s'."));
-        if (!dstPath)
+        if (!dstPath) {
+          FREENONNULL(ren);
           return;
+        }
 
         /* If file is contained in a directory, create directory structure in
            the file system. */
@@ -503,7 +505,7 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
             ln ? ln : fn, STRERROR(errno));
             
           FREE(dstFile);
-          FREE(ren);
+          FREENONNULL(ren);
             
           return;
         }
@@ -518,7 +520,7 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
               LOG(LOG_ERROR, _("Could not move or copy downloaded file %s to %s: %s."),
                 fnURL, dstFile, STRERROR(errno));
               FREE(dstFile);
-              FREE(ren);
+              FREENONNULL(ren);
   
               return;
             }