diff --git a/lib/api.dart b/lib/api.dart
index 9d64d29f..6c335740 100644
--- a/lib/api.dart
+++ b/lib/api.dart
@@ -478,7 +478,7 @@ class InvenTreeAPI {
       return null;
     }
 
-    var data = json.encode(body);
+    var data = json.encode(_body);
 
     // Set headers
     request.headers.set('Accept', 'application/json');
@@ -532,7 +532,8 @@ class InvenTreeAPI {
             context: {
               "url": _url,
               "statusCode": "${response.statusCode}",
-              "data": responseData.toString(),
+              "response": responseData.toString(),
+              "request": body.toString(),
             }
         );
       }
@@ -567,6 +568,21 @@ class InvenTreeAPI {
 
     var response = await request.send();
 
+    if (response.statusCode >= 500) {
+      // Server error
+      if (response.statusCode >= 500) {
+        sentryReportMessage(
+            "Server error on file upload",
+            context: {
+              "url": _url,
+              "statusCode": "${response.statusCode}",
+              "response": response.toString(),
+              "request": request.fields.toString(),
+            }
+        );
+      }
+    }
+
     return response;
   }
 
@@ -679,7 +695,8 @@ class InvenTreeAPI {
           context: {
             "url": _url,
             "statusCode": "${response.statusCode}",
-            "data": responseData.toString(),
+            "response": responseData.toString(),
+            "request": body.toString(),
           }
         );
       }
@@ -900,7 +917,8 @@ class InvenTreeAPI {
             context: {
               "url": url,
               "statusCode": "${response.statusCode}",
-              "data": responseData.toString(),
+              "response": responseData.toString(),
+              "params": params.toString(),
             }
         );
       }