diff --git a/lib/server/controllers/apiController.js b/lib/server/controllers/apiController.js
index 0f976d7..d76d458 100644
--- a/lib/server/controllers/apiController.js
+++ b/lib/server/controllers/apiController.js
@@ -52,16 +52,25 @@ var ApiController = function(app) {
                 .then(function(data) {
 
                     debug('Success');
-                    runsDatastore.markAsComplete(run.runId);
+                    
 
                     // Save result in datastore
                     data.runId = run.runId;
-                    resultsDatastore.saveResult(data);
+                    resultsDatastore.saveResult(data)
+                        .then(function() {
 
-                    // Send result if the user was waiting
-                    if (run.params.waitForResponse) {
-                        res.redirect(302, '/api/results/' + run.runId);
-                    }
+                            runsDatastore.markAsComplete(run.runId);
+                            
+                            // Send result if the user was waiting
+                            if (run.params.waitForResponse) {
+                                res.redirect(302, '/api/results/' + run.runId);
+                            }
+                            
+                        })
+                        .fail(function(err) {
+                            debug('Saving results to resultsDatastore failed:');
+                            debug(err);
+                        });
 
                 }).fail(function(err) {