diff --git a/docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java b/docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java
index be42ed39..6eacad5e 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Global application context.
  *
- * @author jtremeaux 
+ * @author jtremeaux
  */
 public class AppContext {
     /**
@@ -62,11 +62,11 @@ public class AppContext {
      * Asynchronous executors.
      */
     private List<ExecutorService> asyncExecutorList;
-    
+
     /**
-     * Private constructor.
+     * Start the application context.
      */
-    private AppContext() {
+    private void startUp() {
         resetEventBus();
 
         // Start indexing handler
@@ -74,7 +74,7 @@ public class AppContext {
         try {
             indexingHandler.startUp();
         } catch (Exception e) {
-            log.error("Error starting the indexing handler, rebuilding the index", e);
+            log.error("Error starting the indexing handler, rebuilding the index: " + e.getMessage());
             RebuildIndexAsyncEvent rebuildIndexAsyncEvent = new RebuildIndexAsyncEvent();
             asyncEventBus.post(rebuildIndexAsyncEvent);
         }
@@ -109,13 +109,13 @@ public class AppContext {
             }
         }
     }
-    
+
     /**
      * (Re)-initializes the event buses.
      */
     private void resetEventBus() {
         asyncExecutorList = new ArrayList<>();
-        
+
         asyncEventBus = newAsyncEventBus();
         asyncEventBus.register(new FileProcessingAsyncListener());
         asyncEventBus.register(new FileDeletedAsyncListener());
@@ -132,19 +132,20 @@ public class AppContext {
 
     /**
      * Returns a single instance of the application context.
-     * 
+     *
      * @return Application context
      */
     public static AppContext getInstance() {
         if (instance == null) {
             instance = new AppContext();
+            instance.startUp();
         }
         return instance;
     }
-    
+
     /**
      * Creates a new asynchronous event bus.
-     * 
+     *
      * @return Async event bus
      */
     private EventBus newAsyncEventBus() {
diff --git a/docs-core/src/main/java/com/sismics/util/jpa/DialectUtil.java b/docs-core/src/main/java/com/sismics/util/jpa/DialectUtil.java
index a4f8b8f1..57639427 100644
--- a/docs-core/src/main/java/com/sismics/util/jpa/DialectUtil.java
+++ b/docs-core/src/main/java/com/sismics/util/jpa/DialectUtil.java
@@ -13,7 +13,7 @@ public class DialectUtil {
      * @return Object not found
      */
     public static boolean isObjectNotFound(String message) {
-        return EMF.isDriverH2() && message.contains("object not found") ||
+        return EMF.isDriverH2() && message.contains("not found") ||
                 EMF.isDriverPostgresql() && message.contains("does not exist");
     }