Properly catch JSON parsing errors

cletusc · Nov 11, 2014 · 67bc939 · 67bc939
1 parent f8fe986
commit 67bc939
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -87,7 +87,15 @@ TwitchAPI.prototype.api = function (path, options, callback) {
 		if (error) {
 			return callback.call(self, error);
 		}
-		return callback.call(self, null, response.statusCode, (options.json ? JSON.parse(body) : body));
+		if (options.json) {
+			try {
+				body = JSON.parse(body);
+			}
+			catch (error) {
+				return callback.call(self, error);
+			}
+		}
+		return callback.call(self, null, response.statusCode, body);
 	});
 
 	return this;