diff --git a/Makefile b/Makefile
index 2c37491..d454f4c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,5 +12,6 @@ tag_latest:
 	docker tag $(NAME):$(VERSION) $(NAME):latest
 
 release: tag_latest
+	@if ! docker images phusion/baseimage | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	docker push $(NAME)
 	@echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)"