diff --git a/lib/Error.js b/lib/Error.js
index fdd3549..d4448fe 100644
--- a/lib/Error.js
+++ b/lib/Error.js
@@ -30,13 +30,14 @@ _Error.extend = utils.protoExtend;
 var FigureError = _Error.FigureError = _Error.extend({
   type: 'figure_error',
   populate: function(raw) {
-    // Move from prototype def (so it appears in stringified obj)
+	// Move from prototype def (so it appears in stringified obj)
     this.type = this.type;
-    this.stack = (new Error(raw.message)).stack;
-    this.status = raw.status;
-    this.message = raw.message;
-    this.text = raw.text;
-    this.raw = raw;
+    this.stack = (new Error(raw.error.message)).stack;
+    this.status = raw.error.status;
+    this.message = raw.error.message;
+	this.text = raw.error.text;
+	this.body = raw.body;
+    this.raw = raw.error;
   },
 });
 
diff --git a/lib/FigureResource.js b/lib/FigureResource.js
index a5dbedd..72fd5a2 100644
--- a/lib/FigureResource.js
+++ b/lib/FigureResource.js
@@ -146,7 +146,7 @@ FigureResource.prototype = {
         callback(new Error.FigureConnectionError(err), null)
       } else if (err && res && res.error) {
         // throw different errors based on res.error.status
-        self._errorHandler(res.error, callback);
+        self._errorHandler(res, callback);
       } else if (err) {
         // unknown error
         callback(new Error.FigureError(err), null)
diff --git a/package.json b/package.json
index 24ff8e0..7c95ac2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "figure-sdk",
-  "version": "0.2.32",
+  "version": "0.2.33",
   "description": "The Figure JavaScript SDK",
   "main": "lib/figure.js",
   "homepage": "https://github.com/postcard/figure-sdk-node",