diff --git a/resources/create-certs.sh b/resources/create-certs.sh
index b1b785d..b777b31 100644
--- a/resources/create-certs.sh
+++ b/resources/create-certs.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 #see https://docs.docker.com/engine/security/https/
+set -e
+
+if [ "$DEBUG" = "true" ]; then
+  set -x
+fi
 
 EXPIRATIONDAYS=700
 CASUBJSTRING="/C=GB/ST=London/L=London/O=ExampleCompany/OU=IT/CN=example.com/emailAddress=test@example.com"
diff --git a/resources/entrypoint.sh b/resources/entrypoint.sh
index e0b6a8a..6634bdd 100644
--- a/resources/entrypoint.sh
+++ b/resources/entrypoint.sh
@@ -1,11 +1,16 @@
 #!/bin/sh
+set -e
+
+if [ "$DEBUG" = "true" ]; then
+  set -x
+fi
 
 if [ -n "$CERTS_PASSWORD_FILE" ]; then
   echo "Using cert password from $CERTS_PASSWORD_FILE"
   CREATE_CERTS_WITH_PW="$(cat $CERTS_PASSWORD_FILE)"
 fi
 
-if [ -n $CREATE_CERTS_WITH_PW ]; then
+if [ -n "$CREATE_CERTS_WITH_PW" ]; then
   if [ -z "$(ls -A $CERTS_DIR)" ]; then
 
     echo "Create CA cert"
@@ -26,4 +31,7 @@ if [ -n $CREATE_CERTS_WITH_PW ]; then
 
     echo "$CERTS_DIR is not empty. Not creating certs."
   fi
+
+else  
+  echo "CREATE_CERTS_WITH_PW is not set. Not creating certs."
 fi