updates based on comments on #15

lib/index.js

@@ -26,7 +26,8 @@ internals.MemoryCacheEntry = function MemoryCacheEntry (key, value, ttl, allowMi
         // copy buffer to prevent value from changing while in the cache
         value.copy(this.item);
         valueByteSize = this.item.length;
-    } else {
+    }
+    else {
         // stringify() to prevent value from changing while in the cache
         this.item = JSON.stringify(value);
         valueByteSize = Buffer.byteLength(this.item);
@@ -113,16 +114,16 @@ internals.Connection.prototype.get = function (key, callback) {
     }
 
     var value = null;
-    try {
-        if (Buffer.isBuffer(envelope.item)) {
-            value = envelope.item;
-        }
-        else {
-            value = JSON.parse(envelope.item);
-        }
+
+    if (Buffer.isBuffer(envelope.item)) {
+        value = envelope.item;
     }
-    catch (err) {
-        return callback(new Error('Bad value content'));
+    else {
+        value = internals.parseJSON(envelope.item);
+
+        if (value instanceof Error) {
+            return callback(new Error('Bad value content'));
+        }
     }
 
     var result = {
@@ -207,4 +208,19 @@ internals.Connection.prototype.drop = function (key, callback) {
     }
 
     return callback();
-};
+};
+
+
+internals.parseJSON = function (json) {
+
+    var obj = null;
+
+    try {
+        obj = JSON.parse(json);
+    }
+    catch (err) {
+        obj = err;
+    }
+
+    return obj;
+};