diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java
index 587d349..91c0b0c 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java
@@ -38,7 +38,7 @@ public class BaseRequest {
     }
 
     public static final String getMandatory(String param,Document params) throws InvalidPluginRequestException {
-        if(!params.containsKey(param)) throw new InvalidPluginRequestException("Missing mandatory parameter "+param);
+        if(params==null || params.isEmpty()|| !params.containsKey(param)) throw new InvalidPluginRequestException("Missing mandatory parameter "+param);
         return params.getString(param);
     }