Index: trunk/psModules/src/config/pmConfig.c
===================================================================
--- trunk/psModules/src/config/pmConfig.c	(revision 17911)
+++ trunk/psModules/src/config/pmConfig.c	(revision 17940)
@@ -880,12 +880,6 @@
     }
 
-    if (!config->database) {
-        psDB *dbh = pmConfigDB(config); // Database handle
-        if (!dbh) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to open database connection.");
-            psFree(config);
-            return NULL;
-        }
-        config->database = dbh;
+    if (!(config->database = pmConfigDB(config))) {
+        psWarning("Unable to open database connection.");
     }
 
@@ -1195,4 +1189,9 @@
     }
 
+    if (strcasecmp(dbServer, "XXX") == 0 || strcasecmp(dbServer, "NONE") == 0) {
+        psTrace("psModules.config", 1, "Database initialisation skipped: server is %s.", dbServer);
+        return NULL;
+    }
+
     return psDBInit(dbServer, dbUsername, dbPassword, dbName, dbPort);
     #endif