diff --git a/changelog.md b/changelog.md
index 5262d7bebc..782afc2437 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,6 +11,8 @@ Bugfixes:
 
 -  Fix argument mutation while using the array notation with the multi constructor (@BridgeAR)
 -  Fix multi.hmset key not being type converted if used with an object and key not being a string (@BridgeAR)
+-  Fix parser errors not being catched properly (@BridgeAR)
+-  Fix a crash that could occur if a redis server does return the info command as usual #541 (@BridgeAR)
 
 ## v2.0.1 - Sep 24, 2015
 
diff --git a/index.js b/index.js
index 8bc2b72430..dc41a42c7a 100644
--- a/index.js
+++ b/index.js
@@ -343,6 +343,14 @@ RedisClient.prototype.on_info_cmd = function (err, res) {
         return;
     }
 
+    /* istanbul ignore if: some servers might not respond with any info data. This is just a safety check that is difficult to test */
+    if (!res) {
+        debug('The info command returned without any data.');
+        this.server_info = {};
+        this.on_ready();
+        return;
+    }
+
     var self = this;
     var obj = {};
     var lines = res.toString().split("\r\n");