diff --git a/tools/camera/CAMERA_findAdducts.R b/tools/camera/CAMERA_findAdducts.R
index acdf145a2..90131f428 100755
--- a/tools/camera/CAMERA_findAdducts.R
+++ b/tools/camera/CAMERA_findAdducts.R
@@ -50,7 +50,11 @@ rawFilePath <- getRawfilePathFromArguments(singlefile, zipfile, args)
 zipfile <- rawFilePath$zipfile
 singlefile <- rawFilePath$singlefile
 args <- rawFilePath$args
-directory <- retrieveRawfileInTheWorkingDir(singlefile, zipfile)
+
+print("singlefile :", singlefile)
+if (!is.null(singlefile)) {
+  directory <- retrieveRawfileInTheWorkingDir(singlefile, zipfile)
+}
 
 # Check if the 'rules' argument in 'args' is NULL
 if (is.null(args$rules)) {
diff --git a/tools/camera/CAMERA_findIsotopes.R b/tools/camera/CAMERA_findIsotopes.R
index 356f6ec20..523d93fb3 100755
--- a/tools/camera/CAMERA_findIsotopes.R
+++ b/tools/camera/CAMERA_findIsotopes.R
@@ -50,7 +50,11 @@ rawFilePath <- getRawfilePathFromArguments(singlefile, zipfile, args)
 zipfile <- rawFilePath$zipfile
 singlefile <- rawFilePath$singlefile
 args <- rawFilePath$args
-directory <- retrieveRawfileInTheWorkingDir(singlefile, zipfile)
+
+print("singlefile :", singlefile)
+if (!is.null(singlefile)) {
+  directory <- retrieveRawfileInTheWorkingDir(singlefile, zipfile)
+}
 
 # Verify if the xa object is loaded
 if (!exists("xa")) {
diff --git a/tools/camera/CAMERA_groupCorr.R b/tools/camera/CAMERA_groupCorr.R
index 0b5977c74..7789e46ab 100755
--- a/tools/camera/CAMERA_groupCorr.R
+++ b/tools/camera/CAMERA_groupCorr.R
@@ -50,7 +50,11 @@ rawFilePath <- getRawfilePathFromArguments(singlefile, zipfile, args)
 zipfile <- rawFilePath$zipfile
 singlefile <- rawFilePath$singlefile
 args <- rawFilePath$args
-directory <- retrieveRawfileInTheWorkingDir(singlefile, zipfile)
+
+print("singlefile :", singlefile)
+if (!is.null(singlefile)) {
+  directory <- retrieveRawfileInTheWorkingDir(singlefile, zipfile)
+}
 
 # Ensure the xa object is loaded
 if (!exists("xa")) {
diff --git a/tools/camera/CAMERA_groupFWHM.R b/tools/camera/CAMERA_groupFWHM.R
index 1dcac2988..697b04789 100755
--- a/tools/camera/CAMERA_groupFWHM.R
+++ b/tools/camera/CAMERA_groupFWHM.R
@@ -50,7 +50,11 @@ rawFilePath <- getRawfilePathFromArguments(singlefile, zipfile, args)
 zipfile <- rawFilePath$zipfile
 singlefile <- rawFilePath$singlefile
 args <- rawFilePath$args
-directory <- retrieveRawfileInTheWorkingDir(singlefile, zipfile)
+
+print("singlefile :", singlefile)
+if (!is.null(singlefile)) {
+  directory <- retrieveRawfileInTheWorkingDir(singlefile, zipfile)
+}
 
 # If the xdata object exists, convert it to xcmsSet
 if (exists("xdata")) {