diff --git a/src/js/services/shapeShiftApiService.js b/src/js/services/shapeShiftApiService.js
index cc5fb0792..92564464a 100644
--- a/src/js/services/shapeShiftApiService.js
+++ b/src/js/services/shapeShiftApiService.js
@@ -23,6 +23,13 @@ var ShapeShift = (function() {
                 if (xmlhttp.status == 200) {
                     var parsedResponse = JP(xmlhttp.responseText);
                     cb.apply(null, [parsedResponse]);
+                } else if (xmlhttp.status === 500) {
+                    var parsedResponse = JP(xmlhttp.responseText);
+                    if (typeof parsedResponse.error === 'string') {
+                        cb.apply(null, [parsedResponse]);
+                    } else {
+                        cb.apply(null, [new Error('Request Failed')]);
+                    }
                 } else {
                     cb.apply(null, [new Error('Request Failed')])
                 }