diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 469f810..939e59b 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 sed -i "s/ServerName.*/ServerName ${FOURGET_SERVER_NAME}/g" /etc/apache2/httpd.conf
 sed -i "s/ServerAdmin.*/ServerAdmin ${FOURGET_SERVER_ADMIN_EMAIL}/g" /etc/apache2/httpd.conf
-httpd -DFOREGROUND
+exec httpd -DFOREGROUND