diff --git a/lib/config/index.js b/lib/config/index.js
index <HASH>..<HASH> 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -1,20 +1,23 @@
 module.exports = (function(){
     'use strict';
 
-    var conf = {
-        db: {},
-        crypto: {},
-        cache: {},
-        assets: {},
-        logger : {}
-    };
+    var _ = require('underscore'),
+        conf = {
+            db: {},
+            crypto: {},
+            cache: {},
+            assets: {},
+            logger : {}
+        };
 
     conf.init = function(conf){
-        this.db = conf.db;
-        this.crypto = conf.crypto;
-        this.cache = conf.cache;
-        this.assets = conf.assets;
-        this.logger = conf.logger;
+        if ( !_.isUndefined(conf) ) {
+            this.db = conf.db;
+            this.crypto = conf.crypto;
+            this.cache = conf.cache;
+            this.assets = conf.assets;
+            this.logger = conf.logger;
+        }
     };
 
     return conf;
Checked for undefined in case someone init conf without specifying it.