diff --git a/src/Acquisition/FolderInputSystem.java b/src/Acquisition/FolderInputSystem.java
index 9acc836c..c34a2cf9 100644
--- a/src/Acquisition/FolderInputSystem.java
+++ b/src/Acquisition/FolderInputSystem.java
@@ -314,6 +314,9 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings, D
 			}
 			selection = folderInputParameters.getSelectedFiles();
 		}
+		if (selection == null) {
+			return 0;
+		}
 		if (selection.length > 0) {
 			System.out.println("FolderInputSystem.makeSelFileList(): Searching for sound files in " + selection[0]);
 		}