diff --git a/lib/Connection.js b/lib/Connection.js
index c3faff3..f4063e8 100644
--- a/lib/Connection.js
+++ b/lib/Connection.js
@@ -1389,6 +1389,7 @@ Connection.prototype._resTagged = function(info) {
     });
   } else {
     req.cbargs.unshift(err);
+    req.cbargs.push(info.textCode);
     req.cb && req.cb.apply(this, req.cbargs);
   }
 
diff --git a/lib/Parser.js b/lib/Parser.js
index ea46c43..72f423b 100644
--- a/lib/Parser.js
+++ b/lib/Parser.js
@@ -309,7 +309,7 @@ function parseTextCode(text, literals) {
   if (r.length === 1)
     return r[0];
   else
-    return { key: r[0], val: r[1] };
+    return { key: r[0], val: r.length === 2 ? r[1] : r.slice(1) };
 }
 
 function parseESearch(text, literals) {