diff --git a/lib/inventree/model.dart b/lib/inventree/model.dart
index 977f4417..f9935227 100644
--- a/lib/inventree/model.dart
+++ b/lib/inventree/model.dart
@@ -242,8 +242,14 @@ class InvenTreeModel {
       return null;
     })
     .then((http.Response response) {
-      var decoded = json.decode(response.body);
-      _model = createFromJson(decoded);
+      // Server should return HTTP_201_CREATED
+      if (response.statusCode == 201) {
+        var decoded = json.decode(response.body);
+        _model = createFromJson(decoded);
+      } else {
+        print("Error creating object: Status Code ${response.statusCode}");
+        print(response.body);
+      }
     });
 
     return _model;
diff --git a/lib/inventree/stock.dart b/lib/inventree/stock.dart
index 1b672277..0252f43e 100644
--- a/lib/inventree/stock.dart
+++ b/lib/inventree/stock.dart
@@ -88,7 +88,7 @@ class InvenTreeStockItem extends InvenTreeModel {
 
   // Get all the test templates associated with this StockItem
   Future<void> getTestTemplates(BuildContext context, {bool showDialog=false}) async {
-    InvenTreePartTestTemplate().list(
+    await InvenTreePartTestTemplate().list(
       context,
       filters: {
         "part": "${partId}",
@@ -110,7 +110,8 @@ class InvenTreeStockItem extends InvenTreeModel {
   int get testResultCount => testResults.length;
 
   Future<void> getTestResults(BuildContext context, {bool showDialog=false}) async {
-    InvenTreeStockItemTestResult().list(
+
+    await InvenTreeStockItemTestResult().list(
       context,
       filters: {
         "stock_item": "${pk}",
@@ -144,7 +145,6 @@ class InvenTreeStockItem extends InvenTreeModel {
       data["notes"] = notes;
     }
 
-
     bool _result = false;
 
     await InvenTreeStockItemTestResult().create(context, data).then((InvenTreeModel model) {
diff --git a/lib/widget/stock_item_test_results.dart b/lib/widget/stock_item_test_results.dart
index e8523bde..3e761ac3 100644
--- a/lib/widget/stock_item_test_results.dart
+++ b/lib/widget/stock_item_test_results.dart
@@ -5,6 +5,8 @@ import 'package:InvenTree/api.dart';
 import 'package:InvenTree/widget/dialogs.dart';
 import 'package:InvenTree/widget/fields.dart';
 
+import 'dart:io';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:InvenTree/widget/refreshable_state.dart';
@@ -39,7 +41,25 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
 
   _StockItemTestResultDisplayState(this.item);
 
-  void addTestResult({String name = '', bool nameIsEditable = true, bool result = false, String value = '', bool valueRequired = false, bool attachmentRequired = false}) {
+  void uploadTestResult(String name, bool result, String value, String notes) async {
+
+    item.uploadTestResult(
+      context,
+      name,
+      result,
+      value: value,
+      notes: notes,
+    ).then((bool success) {
+      if (success) {
+        // TODO - Show a SnackBar here!
+        refresh();
+      } else {
+        showErrorDialog(context, "Error", "Could not upload test result to server");
+      }
+    });
+  }
+
+  void addTestResult({String name = '', bool nameIsEditable = true, bool result = false, String value = '', bool valueRequired = false, bool attachmentRequired = false}) async  {
 
     String _name;
     bool _result;
@@ -59,16 +79,9 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
           child: Text("Save"),
           onPressed: () {
             if (_addResultKey.currentState.validate()) {
-
               _addResultKey.currentState.save();
-
-              item.uploadTestResult(
-                  context,
-                  _name,
-                  _result,
-                  value: _value,
-                  notes: _notes,
-              );
+              Navigator.pop(context);
+              uploadTestResult(_name, _result, _value, _notes);
             }
           },
         )
@@ -92,7 +105,6 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
           allowEmpty: true,
           onSaved: (value) => _value = value,
           validator: (String value) {
-            print("Value: " + value);
             if (valueRequired && (value == null || value.isEmpty)) {
               return "Value required for this test";
             }