diff --git a/lib/Controller/StackApiController.php b/lib/Controller/StackApiController.php
index ad4dae9be..bde0296c7 100644
--- a/lib/Controller/StackApiController.php
+++ b/lib/Controller/StackApiController.php
@@ -60,7 +60,12 @@ class StackApiController extends ApiController {
 	 */
 	public function index($boardId) {
 		$stacks = $this->service->findAll($boardId);
-		return new DataResponse($stacks);
+		
+		if ($stacks === false || $stacks === null) {
+			return new DataResponse("No Stacks Found", HTTP::STATUS_NOT_FOUND);
+		}
+
+		return new DataResponse($stacks, HTTP::STATUS_OK);
 	}
 
 	/**