diff --git a/init-db.sh b/init-db.sh
index d437b0b..25b1fc1 100644
--- a/init-db.sh
+++ b/init-db.sh
@@ -6,11 +6,11 @@ if [ "$(id -u)" != "0" ]; then
 fi
 
 if [ -z "$1" ] || [ -z "$2" ]; then
-  echo "Please provide all arguments: CREATE_DB_NAME, CREATE_DB,_PASSWORD"
+  echo "Please provide all arguments: CREATE_DB_NAME, CREATE_DB_PASSWORD"
   exit 1
 fi
 
-trap 'echo -e "\033[31mAn error has occurred\033[0m"; exit 1' EXIT
+trap 'echo -e "\033[31minit-db.sh: An error has occurred\033[0m"; exit 1' ERR
 set -e
 
 export DEBIAN_FRONTEND=noninteractive
@@ -29,7 +29,7 @@ sudo docker exec -i postgres psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$PO
 EOSQL
 
 
-trap - EXIT
+trap - ERR
 echo -e "\033[32mDatabase $CREATE_DB_NAME created successfully\033[0m"