diff --git a/lib/sendgrid.js b/lib/sendgrid.js index c547e9964..5c5e57a87 100644 --- a/lib/sendgrid.js +++ b/lib/sendgrid.js @@ -92,7 +92,11 @@ SendGridInstance.prototype.API = function(request, callback) { } return new SendGrid.Promise(function(resolve, reject) { self.client.API(request, function(response) { - response.body = response.body ? JSON.parse(response.body) : response.body; + try { + response.body = response.body ? JSON.parse(response.body) : response.body; + } catch (e) { + return reject(e) + } if (isValidResponse(response)) { resolve(response); } @@ -107,7 +111,11 @@ SendGridInstance.prototype.API = function(request, callback) { //Use callback self.client.API(request, function(response) { - response.body = response.body ? JSON.parse(response.body) : response.body; + try { + response.body = response.body ? JSON.parse(response.body) : response.body; + } catch (e) { + return callback(e) + } if (isValidResponse(response)) { callback(null, response); }