diff --git a/services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiServiceImpl.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiServiceImpl.java
index da655b8eccb..e2704d8ce1d 100644
--- a/services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiServiceImpl.java
+++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiServiceImpl.java
@@ -469,8 +469,12 @@ public class AclApiServiceImpl extends ManagerBase implements AclApiService, Man
             for (AclPolicyPermission permission : permissions) {
                 AclPermissionResponse perm = new AclPermissionResponse();
                 perm.setAction(permission.getAction());
-                perm.setEntityType(AclEntityType.valueOf(permission.getEntityType()));
-                perm.setScope(PermissionScope.valueOf(permission.getScope()));
+                if (permission.getEntityType() != null) {
+                    perm.setEntityType(AclEntityType.valueOf(permission.getEntityType()));
+                }
+                if (permission.getScope() != null) {
+                    perm.setScope(PermissionScope.valueOf(permission.getScope()));
+                }
                 perm.setScopeId(permission.getScopeId());
                 perm.setPermission(permission.getPermission());
                 response.addPermission(perm);