diff --git a/lib/services.js b/lib/services.js
index 497ec7a..008463d 100644
--- a/lib/services.js
+++ b/lib/services.js
@@ -79,7 +79,7 @@ function initDatastoreConnection(config, context) {
 
 		Datastore.create(dbconfig, function(err, datastore) {
 			
-			if (err) {
+			if (err) {				
 				return callback(err);
 			} else {
 				context.r = context.redshift = {};
diff --git a/redshift-cli.js b/redshift-cli.js
index 44997ba..dcf64a1 100644
--- a/redshift-cli.js
+++ b/redshift-cli.js
@@ -35,6 +35,12 @@ var context = replServer.context;
 logger.info('please wait...');
 
 services.init(config, context, function(err, results) {
+	if (err) {
+		logger.error(err);
+		process.exit(1);
+		return;
+	}
+
 	logger.info('ready\n\r');
 
 	//require('fs').writeFileSync('zzz', $u.inspect(context))