diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
index 4e241b518642c426cea40b546bd70f4f2557453a..b5e82bed169c69ba5290485c9481fd95dcbf8078 100644
--- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
 import("Sql_lib");
 import("system.project");
 import("system.vars");
@@ -94,6 +95,9 @@ result.object(res);
 
 function prepareOverview(pPermSetId, pCurrOverview, pMode) {
     var conditionalPermActionId = [], currOverview;
+    if (pPermSetId == "") {
+        return pCurrOverview;
+    }
     switch (pMode) {
         case "default":
             var permId = PermissionUtil.getPermissionWithoutCond(pPermSetId);
diff --git a/process/Permission_lib/process.js b/process/Permission_lib/process.js
index cff2ffa1852bc16a54a5f299d150be993d231585..2362b10b23e0e7773dc54d5af0b95491c39388d8 100644
--- a/process/Permission_lib/process.js
+++ b/process/Permission_lib/process.js
@@ -249,7 +249,7 @@ function PermissionUtil () {}
         return newSelect("ENTITY_ID", alias)
         .from("ASYS_PERMISSIONSET")
         .whereIfSet("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", pSetId)
-        .cell(true, "");
+        .cell();
     }
 
     /**
@@ -287,7 +287,7 @@ function PermissionUtil () {}
         .whereIfSet("ASYS_PERMISSION.ASYS_PERMISSIONSET_ID", pSetId)
         .and(new SqlBuilder(alias).where()
             .or("COND is not null")
-            .or("ASYS_PERMISSION.COND", emptyCond, sqlHelper.castLob("#", 254) +" != ?")
+            .and("ASYS_PERMISSION.COND", emptyCond, sqlHelper.castLob("#", 254) +" != ?")
             )
         .arrayColumn();
     }