diff --git a/data-access/servlet/src/main/java/cutout/DatasetsImpl.java b/data-access/servlet/src/main/java/cutout/DatasetsImpl.java
index d37a7f73203ad7d0f937c67881f39940c2824af4..8cc07a18350e76e9ca0d1fac2ce1ec11dd845935 100644
--- a/data-access/servlet/src/main/java/cutout/DatasetsImpl.java
+++ b/data-access/servlet/src/main/java/cutout/DatasetsImpl.java
@@ -74,7 +74,18 @@ class DatasetsImpl implements Datasets
 
          String updatedJsonString = JdlMCutout.resolveAndUpdateJsonRequest(jdlJson, settings, subsurveys);
 
-         String outJson = doRpc( JdlMCutout.mcutoutToJson(updatedJsonString) );
+         String outJson;
+
+         if(settings.amqpConn.isHostnameEmpty())
+         {
+            LOGGER.info("doMCutout in CLI/ExecCmd not implemented");
+            outJson = null;
+         }
+         else
+         {
+            LOGGER.info("doMCutout over AMQP");
+            outJson = doRpc( JdlMCutout.mcutoutToJson(updatedJsonString) );
+         }
 
          return JdlMCutout.responseFromMCutoutJson(outJson);
       }