diff --git a/src/source-pcap-file-directory-helper.c b/src/source-pcap-file-directory-helper.c
index cd15a4786b..7b84090b9a 100644
--- a/src/source-pcap-file-directory-helper.c
+++ b/src/source-pcap-file-directory-helper.c
@@ -423,6 +423,7 @@ TmEcode PcapDirectoryDispatchForTimeRange(PcapFileDirectoryVars *pv,
                 pftv->filename = SCStrdup(current_file->filename);
                 if (unlikely(pftv->filename == NULL)) {
                     SCLogError(SC_ERR_MEM_ALLOC, "Failed to allocate filename");
+                    CleanupPcapFileFileVars(pftv);
                     SCReturnInt(TM_ECODE_FAILED);
                 }
                 pftv->shared = pv->shared;
@@ -509,7 +510,7 @@ TmEcode PcapDirectoryDispatch(PcapFileDirectoryVars *ptv)
                     SCLogInfo("Directory %s no longer exists, stopping",
                               ptv->filename);
                     status = TM_ECODE_DONE;
-                } else {
+                } else if(directory_check != NULL) {
                     closedir(directory_check);
                 }
             }
diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c
index cbb7bcef36..1c408829ec 100644
--- a/src/source-pcap-file.c
+++ b/src/source-pcap-file.c
@@ -270,6 +270,7 @@ TmEcode ReceivePcapFileThreadInit(ThreadVars *tv, const void *initdata, void **d
         PcapFileDirectoryVars *pv = SCMalloc(sizeof(PcapFileDirectoryVars));
         if (unlikely(pv == NULL)) {
             SCLogError(SC_ERR_MEM_ALLOC, "Failed to allocate directory vars");
+            closedir(directory);
             CleanupPcapFileThreadVars(ptv);
             SCReturnInt(TM_ECODE_FAILED);
         }