diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/DatabaseContextUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/DatabaseContextUtils.java
index 29ea2f70d3ebea1171117325a62b894cf8d7798b..da69b94ca1c931761b75fd8c3599ed5c8e92d212 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/DatabaseContextUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/DatabaseContextUtils.java
@@ -44,7 +44,7 @@ public class DatabaseContextUtils
     public static DatabaseConfigurationContext getDatabaseContext(IDAOFactory daoFactory)
     {
         PersistencyResources persistencyResources = daoFactory.getPersistencyResources();
-        DatabaseConfigurationContext context = persistencyResources.getContextOrNull();
+        DatabaseConfigurationContext context = persistencyResources.getContext();
         if (context == null)
         {
             throw new ConfigurationFailureException("Missing database configuration context.");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
index e6238f54e23132d256d2c6b9a8c0fd9b46c3453b..e61aa3dd290f85c4918f4e9f901f64d904d89401 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
@@ -28,33 +28,32 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IFullTextInd
  */
 public final class PersistencyResources
 {
-    private final DatabaseConfigurationContext contextOrNull;
+    private final DatabaseConfigurationContext context;
 
-    private final SessionFactory sessionFactoryOrNull;
+    private final SessionFactory sessionFactory;
 
     private final IFullTextIndexUpdateScheduler indexUpdateScheduler;
 
     private final IDynamicPropertyEvaluationScheduler dynamicPropertyEvaluationScheduler;
 
-    public PersistencyResources(DatabaseConfigurationContext contextOrNull,
-            SessionFactory sessionFactoryOrNull,
-            IFullTextIndexUpdateScheduler indexUpdateScheduler,
+    public PersistencyResources(DatabaseConfigurationContext context,
+            SessionFactory sessionFactory, IFullTextIndexUpdateScheduler indexUpdateScheduler,
             IDynamicPropertyEvaluationScheduler dynamicPropertyEvaluationScheduler)
     {
-        this.contextOrNull = contextOrNull;
-        this.sessionFactoryOrNull = sessionFactoryOrNull;
+        this.context = context;
+        this.sessionFactory = sessionFactory;
         this.indexUpdateScheduler = indexUpdateScheduler;
         this.dynamicPropertyEvaluationScheduler = dynamicPropertyEvaluationScheduler;
     }
 
-    public final DatabaseConfigurationContext getContextOrNull()
+    public final DatabaseConfigurationContext getContext()
     {
-        return contextOrNull;
+        return context;
     }
 
-    public final SessionFactory getSessionFactoryOrNull()
+    public final SessionFactory getSessionFactory()
     {
-        return sessionFactoryOrNull;
+        return sessionFactory;
     }
 
     public IFullTextIndexUpdateScheduler getIndexUpdateScheduler()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityWithPropertiesDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityWithPropertiesDAO.java
index c4b30e5c068f07c6a1bd2980d0b60a81400651d2..ecd4dfab184e8ba4cdfe761483a0688b302489cd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityWithPropertiesDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityWithPropertiesDAO.java
@@ -73,7 +73,7 @@ public abstract class AbstractGenericEntityWithPropertiesDAO<T extends IEntityIn
             final PersistencyResources persistencyResources,
             final DatabaseInstancePE databaseInstance, final Class<T> entityClass)
     {
-        super(persistencyResources.getSessionFactoryOrNull(), databaseInstance, entityClass);
+        super(persistencyResources.getSessionFactory(), databaseInstance, entityClass);
         this.persistencyResources = persistencyResources;
     }
 
@@ -89,7 +89,7 @@ public abstract class AbstractGenericEntityWithPropertiesDAO<T extends IEntityIn
 
     protected DataSource getDataSource()
     {
-        return persistencyResources.getContextOrNull().getDataSource();
+        return persistencyResources.getContext().getDataSource();
     }
 
     @Override
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
index f3418946584f568293fd99e2ce5740013ff53b4b..efa0f72b80ae4f284d446a7057430e822c958bf5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
@@ -123,7 +123,7 @@ public class AuthorizationDAOFactory implements IAuthorizationDAOFactory
     @Override
     public SessionFactory getSessionFactory()
     {
-        return persistencyResources.getSessionFactoryOrNull();
+        return persistencyResources.getSessionFactory();
     }
 
     private final DatabaseInstancePE getDatabaseInstanceId(final String databaseInstanceCode)
@@ -277,7 +277,7 @@ public class AuthorizationDAOFactory implements IAuthorizationDAOFactory
     @Override
     public void setBatchUpdateMode(boolean batchMode)
     {
-        SessionFactory sessionFactory = persistencyResources.getSessionFactoryOrNull();
+        SessionFactory sessionFactory = persistencyResources.getSessionFactory();
         Session currentSession = sessionFactory.getCurrentSession();
         HibernateUtils.setBatchUpdateMode(currentSession, batchMode);
     }
@@ -286,7 +286,7 @@ public class AuthorizationDAOFactory implements IAuthorizationDAOFactory
     @Override
     public Connection getConnection()
     {
-        final SessionFactory sessionFactory = persistencyResources.getSessionFactoryOrNull();
+        final SessionFactory sessionFactory = persistencyResources.getSessionFactory();
         return sessionFactory.getCurrentSession().connection();
     }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityHistoryDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityHistoryDAO.java
index 6ded4b78ce4b0f30da525079c64672a5ffbbb461..0afa74605ea00a6c800982ed5cb5e3bc0bf5aed5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityHistoryDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityHistoryDAO.java
@@ -39,7 +39,7 @@ class EntityHistoryDAO extends AbstractDAO implements IEntityHistoryDAO
 {
     EntityHistoryDAO(PersistencyResources persistencyResources, DatabaseInstancePE databaseInstance)
     {
-        super(persistencyResources.getSessionFactoryOrNull(), databaseInstance);
+        super(persistencyResources.getSessionFactory(), databaseInstance);
     }
 
     private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
index 9be324f63924259985a1c00718077d9ebed13d03..3e2923034f01cd7e47978fc4e5423c9bc5e22549 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
@@ -72,7 +72,7 @@ final class EntityPropertyTypeDAO extends AbstractDAO implements IEntityProperty
             final PersistencyResources persistencyResources,
             final DatabaseInstancePE databaseInstance)
     {
-        super(persistencyResources.getSessionFactoryOrNull(), databaseInstance);
+        super(persistencyResources.getSessionFactory(), databaseInstance);
         this.entityKind = entityKind;
         this.dynamicPropertyEvaluationScheduler =
                 persistencyResources.getDynamicPropertyEvaluationScheduler();