diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java
index 3d044ba73..231498098 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java
@@ -88,10 +88,16 @@ public class EntitySequenceDAO extends
     @Override
     public EntitySequence getActiveEntitySequence(EntityNameEnum entityName)
             throws InstanceNotFoundException, NonUniqueResultException {
-        return (EntitySequence) getSession().createCriteria(
+        EntitySequence entitySequence = (EntitySequence) getSession()
+                .createCriteria(
                 EntitySequence.class).add(
                 Restrictions.eq("entityName", entityName)).add(
                 Restrictions.eq("active", true)).uniqueResult();
+        if (entitySequence == null) {
+            throw new InstanceNotFoundException(entitySequence,
+                    "Entity sequence not exist");
+        }
+        return entitySequence;
     }
 
     @Override
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
index e38d6e19e..d4855c4eb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
@@ -118,8 +118,11 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
     @Transactional(readOnly = true)
     public void initCreate() {
         editing = false;
-        boolean codeGenerated = configurationDAO.getConfiguration()
-                .getGenerateCodeForBaseCalendars();
+
+        boolean codeGenerated = (configurationDAO.getConfiguration() != null) ? configurationDAO
+                .getConfiguration().getGenerateCodeForBaseCalendars()
+                : false;
+
         this.baseCalendar = BaseCalendar.createBasicCalendar();
 
         if (codeGenerated) {
@@ -149,8 +152,10 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
         forceLoad(this.baseCalendar);
         this.baseCalendar.setCode("");
 
-        boolean codeGenerated = configurationDAO.getConfiguration()
-                .getGenerateCodeForBaseCalendars();
+        boolean codeGenerated = (configurationDAO.getConfiguration() != null) ? configurationDAO
+                .getConfiguration().getGenerateCodeForBaseCalendars()
+                : false;
+
         if (codeGenerated) {
             setDefaultCode();
         }