diff --git a/seqs/mysql.sh b/seqs/mysql.sh
index cf46402..875332c 100755
--- a/seqs/mysql.sh
+++ b/seqs/mysql.sh
@@ -71,7 +71,7 @@ step_10() {
 
   shift
   for arg in "$@" ; do
-    case "$1" in
+    case "${1:-}" in
       --charset|-c)
         dbOption="$2"
         shift 2;;
@@ -104,7 +104,7 @@ step_10() {
 
     read -p "Enter database name: " dbName
   fi
-  endCheckEmpty dbName "database name"
+  endIfEmpty dbName "database name"
   exe mysql -u root -e 'CREATE DATABASE '$dbName' '"$dbOption"';'
   endReturn -o $? "Cannot create database $dbName"
 }
@@ -123,7 +123,7 @@ step_11() {
 
   shift
   for arg in "$@" ; do
-    case "$1" in
+    case "${1:-}" in
       --charset|-c)
         dbOption="$2"
         shift 2;;
@@ -146,13 +146,13 @@ step_11() {
     exe mysql -u root -e 'SELECT User, Host FROM mysql.user;'
     read -p "Enter mysql user name: " dbUser
   fi
-  endCheckEmpty dbUser "user name"
+  endIfEmpty dbUser "user name"
 
   if ! echo "SELECT COUNT(*) FROM mysql.user WHERE user = '$dbUser' AND host = '$dbRemote';" | mysql | grep 1 &>/dev/null; then
     # User does not exist
     if ! dry; then
       read -s -p "Enter mysql user password: " dbPass
-      endCheckEmpty dbPass "password"
+      endIfEmpty dbPass "password"
     else
       info "Enter mysql password: ...skipped..."
     fi
@@ -175,7 +175,7 @@ step_12() {
 
   shift
   for arg in "$@" ; do
-    case "$1" in
+    case "${1:-}" in
       --charset|-c)
         dbOption="$2"
         shift 2;;
@@ -212,7 +212,7 @@ step_14() {
 
   shift
   for arg in "$@" ; do
-    case "$1" in
+    case "${1:-}" in
       --user|-u)
         dbUser="$2"
         shift 2 ;;
@@ -257,7 +257,7 @@ step_34() {
 
   shift
   for arg in "$@" ; do
-    case "$1" in
+    case "${1:-}" in
       --user|-u)
         dbUser="$2"
         shift 2 ;;
@@ -296,7 +296,7 @@ step_50_info() {
 step_50_alias() { echo "backup"; }
 step_50() {
   shift # step number not used
-  if [ -z $1 ] ; then
+  if [ -z "${1:-}" ] ; then
     error -e "No database name provided"
     return 1
   fi
@@ -327,15 +327,15 @@ step_52() {
 readDatabaseInfos() {
   if [ "$dbName" == "" ] ; then
     read -p "Enter postgres database name: " dbName
-    endCheckEmpty dbName "database"
+    endIfEmpty dbName "database"
   fi
   if [ "$dbUser" == "" ] ; then
     read -p "Enter postgres user name: " dbUser
-    endCheckEmpty dbUser "user name"
+    endIfEmpty dbUser "user name"
   fi
   if [ "$dbPass" == "" ] ; then
     read -s -p "Enter postgres password: " dbPass
-    endCheckEmpty postgresPass "password"
+    endIfEmpty postgresPass "password"
   fi
   echo
 }