diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java
index 8a7ae2ec5744a651c2dc12b8a1ce26a60af54a2f..d43929f9d3f6e3150aed72b3091cb0f6a85be83b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java
@@ -57,12 +57,15 @@ public class DemoProcessingPlugin implements IProcessingPluginTask
             DataSetProcessingContext context)
     {
         operationLog.info("Processing of the following datasets has been requested: " + datasets);
-        Map<String, String> parameterBindings = context.getParameterBindings();
-        if (parameterBindings.isEmpty() == false)
+        if (context != null)
         {
-            for (Entry<String, String> entry : parameterBindings.entrySet())
+            Map<String, String> parameterBindings = context.getParameterBindings();
+            if (parameterBindings != null && parameterBindings.isEmpty() == false)
             {
-                operationLog.info("Parameter: " + entry);
+                for (Entry<String, String> entry : parameterBindings.entrySet())
+                {
+                    operationLog.info("Parameter: " + entry);
+                }
             }
         }
         IHierarchicalContentProvider contentProvider =
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
index 7b5e16a3bf7a6c2ee36417a3130cebe08c90b73c..2c81d317054df145084aa61c5ff653722e2d8aa0 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
@@ -2107,7 +2107,7 @@ public class CommonServerTest extends SystemTestCase
                 commonServer.createReportFromDatasets(session.getSessionToken(), serviceKey, Arrays.asList(dataSetCode));
             } catch (Exception e)
             {
-                assertEquals(e.getMessage(), "Data store 'STANDARD' does not have '" + serviceKey + "' report configured.");
+                assertEquals(e.getMessage(), "Data store 'STANDARD' does not have '" + serviceKey + "' reporting plugin configured.");
             }
         } else
         {