diff --git a/src/mad/sh/create_docker_image.sh b/src/mad/sh/create_docker_image.sh
index 052d67ac2d..e947949db2 100755
--- a/src/mad/sh/create_docker_image.sh
+++ b/src/mad/sh/create_docker_image.sh
@@ -52,7 +52,7 @@ fi
 
 # Check dockerdir is different than / and the directory name is an uuid
 regex_uuid="^\{?[A-F0-9a-f]{8}-[A-F0-9a-f]{4}-[A-F0-9a-f]{4}-[A-F0-9a-f]{4}-[A-F0-9a-f]{12}\}?$"
-if [[ ! `echo $dockerdir | awk -F/ '{print $NF}'` =~ $regex_uuid ]]; then
+if [ ! -d $dockerdir ] || [[ ! $(basename $dockerdir) =~ $regex_uuid ]]; then
     exit -1
 fi