diff --git a/novajoin/base.py b/novajoin/base.py
index 23a5b0a..022bc35 100644
--- a/novajoin/base.py
+++ b/novajoin/base.py
@@ -717,9 +717,10 @@ class Fault(webob.exc.HTTPException):
         fault_name = self._fault_names.get(code, "computeFault")
         explanation = self.wrapped_exc.explanation
         fault_data = {
-            fault_name: {
+            'error': {
                 'code': code,
-                'message': explanation}}
+                'message': explanation,
+                'fault_name': fault_name}}
         if code == 413:
             retry = self.wrapped_exc.headers.get('Retry-After', None)
             if retry: