diff --git a/adaptor-ym.js b/adaptor-ym.js
index 2c7428f..b7d2419 100644
--- a/adaptor-ym.js
+++ b/adaptor-ym.js
@@ -6,13 +6,16 @@ var password;
 var callbacks;
 
 function onReady() {
-    logger.info('Going to login to YM as ' + username);
-    setTimeout(
-        YM.login,
-        10000,
-        username, password
-    )
+    var _username = username;
+    var _password = password;
+
+    if (!_username || !-password) {
+        logger.warn('Undefined YM username and password')
+        process.exit(5);
+    }
 
+    logger.info('Going to login to YM as ' + username);
+    YM.login(username, password);
 }
 
 function onLoginSuccessful(data) {
@@ -54,7 +57,11 @@ function init(_username, _password, _logger, _callbacks) {
     YM.on('pm', onPM);
     YM.on('offlinePM', onPM);
 
-    YM.newInstance();
+    setTimeout(
+        YM.newInstance,
+        3000
+    )
+    //YM.newInstance();
 }
 
 function sendMessage(destination, msg) {