diff --git a/PHPCI/Controller/GitController.php b/PHPCI/Controller/GitController.php
index a56d057d..396ecaa9 100644
--- a/PHPCI/Controller/GitController.php
+++ b/PHPCI/Controller/GitController.php
@@ -50,8 +50,17 @@ class GitController extends \PHPCI\Controller
             $build->setStatus(0);
             $build->setLog('');
             $build->setCreated(new \DateTime());
-            $this->_buildStore->save($build);
         } catch (\Exception $ex) {
+            header('HTTP/1.1 400 Bad Request');
+            header('Ex: ' . $ex->getMessage());
+            die('FAIL');
+        }
+
+        try {
+           $this->_buildStore->save($build);
+        } catch (\Exception $ex) {
+            header('HTTP/1.1 500 Internal Server Error');
+            header('Ex: ' . $ex->getMessage());
             die('FAIL');
         }