diff --git a/email_account/email_account b/email_account/email_account
index a02238e..51d68ad 100755
--- a/email_account/email_account
+++ b/email_account/email_account
@@ -87,7 +87,7 @@ test_args ()
 		echo "Error! Too many arguments." >&2
 		exit 1
 	fi
-	if [ $# -eq 0 -o "$1" = "-h" -o "$1" = "-help" ]
+	if [ -z "$1" -o "$1" = "-h" -o "$1" = "-help" ]
 	then
 		usage $(basename $0)
 		exit 0
@@ -427,5 +427,5 @@ main ()
 	return $ret
 }
 
-main "$@"
+main "${@:-""}"
 exit $?