diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
index a667eb42b8d1908f2c8df95de164c448a9a2b759..6b1de00c4db68414ad85ffe6c1e4b9afae9ba849 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
@@ -85,11 +85,11 @@ public class FileBasedImageAnalysisGraphReportingPlugin extends AbstractDataMerg
         {
             final File dir = getDataSubDir(context.getDirectoryProvider(), dataset);
             List<File> matchingFiles = findMatchingFiles(dataset, dir);
-            if (matchingFiles.size() > 1)
+            if (matchingFiles.size() != 1)
             {
                 throw UserFailureException.fromTemplate(
-                        "Found multiple candidate files in the dataset %s ",
-                        dataset.getDataSetCode());
+                        "Expected exactly one matching file in the dataset %s but found %d", dataset
+                                .getDataSetCode(), matchingFiles.size());
             }
             builder.addRow(createRow(dataset, matchingFiles.get(0)));
         }