diff --git a/api.go b/api.go
index 6dbdba3..f676aaa 100644
--- a/api.go
+++ b/api.go
@@ -16,6 +16,7 @@
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"github.com/gorilla/mux"
 	"io"
 	"io/ioutil"
@@ -302,7 +303,7 @@
 	eTag := a.getETag()
 	deployments, err := a.dbMan.getReadyDeployments()
 	if err != nil {
-		a.writeInternalError(w, "Database error")
+		a.writeInternalError(w, fmt.Sprintf("Database error: %s", err.Error()))
 		return
 	}
 	a.sendDeployments(w, deployments, eTag)
diff --git a/data.go b/data.go
index ae7875b..7c98dc2 100644
--- a/data.go
+++ b/data.go
@@ -192,11 +192,7 @@
 
 	log.Debugf("Configurations ready: %v", deployments)
 
-	if len(deployments) == 0 {
-		log.Debug("No resources ready to be deployed")
-		err = sql.ErrNoRows
-	}
-	return deployments, err
+	return deployments, nil
 
 }
 
diff --git a/data_test.go b/data_test.go
index 29f777a..be876af 100644
--- a/data_test.go
+++ b/data_test.go
@@ -88,6 +88,12 @@
 			Expect(count).Should(Equal(3))
 		})
 
+		It("should get empty slice if no deployments are ready", func() {
+			deps, err := testDbMan.getReadyDeployments()
+			Expect(err).Should(Succeed())
+			Expect(len(deps)).Should(BeZero())
+		})
+
 		It("should succefully update local FS location", func() {
 
 			err := testDbMan.updateLocalFsLocation(readyBlobId, readyblobLocalFs)