diff --git a/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java
index 183f1311b6..6593e07f2c 100644
--- a/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java
@@ -83,7 +83,8 @@ public class DMDiscoveryServicePort extends DMAbstractServicePort implements Dis
         {
             options.setMaxItems(parameters.getMaxItems().getValue().intValue());
         }
-        boolean includeAllowableActions = (null != parameters.getIncludeAllowableActions()) ? (parameters.getIncludeAllowableActions().getValue()) : (false);
+        boolean includeAllowableActions = ((null != parameters.getIncludeAllowableActions()) && (null != parameters.getIncludeAllowableActions().getValue())) ? (parameters
+                .getIncludeAllowableActions().getValue()) : (false);
         String renditionFilter = (null != parameters.getRenditionFilter()) ? (parameters.getRenditionFilter().getValue()) : null;
 
         // execute query
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMPolicyServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMPolicyServicePort.java
index e88978f0dc..c9580c7535 100644
--- a/source/java/org/alfresco/repo/cmis/ws/DMPolicyServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMPolicyServicePort.java
@@ -26,7 +26,7 @@ import javax.xml.ws.Holder;
 import org.alfresco.cmis.CMISServiceException;
 import org.alfresco.repo.cmis.ws.utils.ExceptionUtil;
 
-@javax.jws.WebService(name = "PolicyServicePort", serviceName = "PolicyServicePort", portName = "PolicyServicePort", targetNamespace = "http://docs.oasis-open.org/ns/cmis/ws/200908/", endpointInterface = "org.alfresco.repo.cmis.ws.PolicyServicePort")
+@javax.jws.WebService(name = "PolicyServicePort", serviceName = "PolicyService", portName = "PolicyServicePort", targetNamespace = "http://docs.oasis-open.org/ns/cmis/ws/200908/", endpointInterface = "org.alfresco.repo.cmis.ws.PolicyServicePort")
 public class DMPolicyServicePort extends DMAbstractServicePort implements PolicyServicePort
 {
     /**