diff --git a/compose/bin/download b/compose/bin/download
index 7e59731f5..a540eee90 100755
--- a/compose/bin/download
+++ b/compose/bin/download
@@ -11,7 +11,7 @@ NC='\033[0m' # No Color
 bin/stop
 
 if [ -d "./src" ]; then
-  echo "Error: The "src" directory is not empty. Please remove all contents within this directory and try again."
+  echo "Error: The \"src\" directory is not empty. Please remove all contents within this directory and try again."
   exit 1
 fi
 
diff --git a/lib/template b/lib/template
index a9d9ddd3d..8f3a4833e 100755
--- a/lib/template
+++ b/lib/template
@@ -4,6 +4,11 @@ git remote add origin https://github.com/markshust/docker-magento
 git fetch origin -qqq
 git checkout origin/master -- compose
 
+if [ -d "./bin" ]; then
+  echo "Error: The current directory is not empty. Please remove all contents within this directory and try again."
+  exit 1
+fi
+
 mv compose/* ./
 mv compose/.gitignore ./
 mv compose/.vscode ./