diff --git a/Makefile b/Makefile
index cfe2aa752..d791d23f8 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,9 @@ help:
 backend-%: --stack-work-$* --backend-$* --stack-krow-$*
 
 .PHONY: database
-database: .develop.env --stack-work-build --database --stack-krow-build
+database: .develop.env --stack-work-build
+	$(MAKE) -- --database || $(MAKE) -- --stack-krow-build
+	$(MAKE) -- --stack-krow-build
 
 .PHONY: --database
 --database: .develop.env
@@ -46,7 +48,7 @@ clean:
 
 .PHONY: --stack-krow-%
 --stack-krow-%:
-	[[ -d .stack-work-$* && echo ".stack-work-$* already exists, please resolve manually" 1>&2; exit 1 ]]
+	[[ -d .stack-work-$* ]] && (echo ".stack-work-$* already exists, please resolve manually" 1>&2 ; exit 1)
 	mv .stack-work .stack-work-$*
 	flock -u .stack-work.lock