diff --git a/src/main/java/fr/ill/ics/core/property/PropertyManager.java b/src/main/java/fr/ill/ics/core/property/PropertyManager.java
index 46f405d668f8b530f5b8c190233c8e80d3879e5d..2117401019287e0ec11f5a213d00a67c160ec6c6 100644
--- a/src/main/java/fr/ill/ics/core/property/PropertyManager.java
+++ b/src/main/java/fr/ill/ics/core/property/PropertyManager.java
@@ -226,7 +226,6 @@ public class PropertyManager {
 				return false;
 			}
 		} else {
-
 			for (int i = 0; i < files.length; i++) {
 				// We may have more than one "Properties.xml" file (see acquisition controller for example)
 				propertyParser.parseXmlFile(files[i]);
@@ -235,9 +234,8 @@ public class PropertyManager {
 		}
 
 		ConfigManager.getInstance().initControllerProperties(controllerType);
-
-		clientFilesFoundPerControllerType.put(controllerType, true);
-		return true;
+		clientFilesFoundPerControllerType.put(controllerType, !(files == null || files.length == 0));
+		return clientFilesFoundPerControllerType.get(controllerType);
 	}