diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php
index ba6d2e3a..34373ba8 100644
--- a/PHPCI/Builder.php
+++ b/PHPCI/Builder.php
@@ -216,7 +216,12 @@ class Builder implements LoggerAwareInterface
 
         // Clean up:
         $this->buildLogger->log('Removing build.');
-        shell_exec(sprintf('rm -Rf "%s"', $this->buildPath));
+
+        $cmd = 'rm -Rf "%s"';
+        if (IS_WIN) {
+            $cmd = 'rmdir /S /Q "%s"';
+        }
+        $this->executeCommand($cmd, $this->buildPath);
 
         // Update the build in the database, ping any external services, etc.
         $this->build->sendStatusPostback();
diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php
index 19fb3149..03c8c1ac 100644
--- a/PHPCI/Controller/ProjectController.php
+++ b/PHPCI/Controller/ProjectController.php
@@ -17,6 +17,7 @@ use b8\Config;
 use b8\Controller;
 use b8\Store;
 use b8\Form;
+use b8\Exception\HttpException\NotFoundException;
 
 /**
 * Project Controller - Allows users to create, edit and view projects.
@@ -47,7 +48,11 @@ class ProjectController extends \PHPCI\Controller
     */
     public function view($projectId)
     {
-        $project        = $this->projectStore->getById($projectId);
+        $project = $this->projectStore->getById($projectId);
+        if (!$project) {
+            throw new NotFoundException('Project with id: ' . $projectId . ' not found');
+        }
+
         $page           = $this->getParam('p', 1);
         $builds         = $this->getLatestBuildsHtml($projectId, (($page - 1) * 10));