diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c
index 6d2c0b564aa3..4b2c28550d42 100644
--- a/src/source-pcap-file.c
+++ b/src/source-pcap-file.c
@@ -307,6 +307,8 @@ TmEcode ReceivePcapFileThreadInit(ThreadVars *tv, const void *initdata, void **d
         if (pv->should_recurse == true && pv->should_loop == true) {
             SCLogError(SC_ERR_INVALID_ARGUMENT, "Error, --pcap-file-continuous and --pcap-file-recursive "
                                                 "cannot be used together.");
+            CleanupPcapFileDirectoryVars(pv);
+            CleanupPcapFileThreadVars(ptv);
             SCReturnInt(TM_ECODE_FAILED);
         }
 
diff --git a/src/source-pcap.c b/src/source-pcap.c
index 63cc425d17f1..9e49b40e178e 100644
--- a/src/source-pcap.c
+++ b/src/source-pcap.c
@@ -653,14 +653,13 @@ void PcapTranslateIPToDevice(char *pcap_dev, size_t len)
 
     struct addrinfo ai_hints;
     struct addrinfo *ai_list = NULL;
-    int ret = 0;
 
     memset(&ai_hints, 0, sizeof(ai_hints));
     ai_hints.ai_family = AF_UNSPEC;
     ai_hints.ai_flags = AI_NUMERICHOST;
 
     /* try to translate IP */
-    if ((ret = getaddrinfo(pcap_dev, NULL, &ai_hints, &ai_list)) != 0) {
+    if (getaddrinfo(pcap_dev, NULL, &ai_hints, &ai_list) != 0) {
         return;
     }