diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnFilter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnFilter.java
index db4a02d97fdc986d1b8477457d24f220bc3a1ca7..9c3546bc61b7ead641fdcff0023b71aa7ed4b950 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnFilter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnFilter.java
@@ -39,11 +39,12 @@ public class ColumnFilter<T extends ModelData> extends StoreFilterField<T>
     }
 
     @Override
-    protected boolean doSelect(Store<T> store, T parent, T record, String property, String filter)
+    protected boolean doSelect(Store<T> store, T parent, T record, String property,
+            String filterText)
     {
         String name = record.get(column);
         name = name.toLowerCase();
-        if (name.startsWith(filter.toLowerCase()))
+        if (name.startsWith(filterText.toLowerCase()))
         {
             return true;
         }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/GenericServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/GenericServer.java
index 1cd1139a574514889cc8b1f608de1b027b34aaa1..06da9a7ea93e52cd6fd11571ad0679f9f6507775 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/GenericServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/GenericServer.java
@@ -272,14 +272,15 @@ public class GenericServer implements IGenericServer, ISessionProvider,
         {
             throw new UserFailureException("Given role does not exist.");
         }
-        if (roleAssignment.getPerson().compareTo(session.tryGetPerson()) == 0
+        PersonPE personPE = session.tryGetPerson();
+        if (roleAssignment.getPerson().compareTo(personPE) == 0
                 && roleAssignment.getRole().compareTo(RoleCode.ADMIN) == 0)
         {
             boolean isInstanceAdmin = false;
-            if (session != null && session.tryGetPerson() != null
-                    && session.tryGetPerson().getRoleAssignments() != null)
+            if (personPE != null
+                    && personPE.getRoleAssignments() != null)
             {
-                for (RoleAssignmentPE ra : session.tryGetPerson().getRoleAssignments())
+                for (RoleAssignmentPE ra : personPE.getRoleAssignments())
                 {
                     if (ra.getDatabaseInstance() != null && ra.getRole().equals(RoleCode.ADMIN))
                     {