diff --git a/usr/local/share/bastille/template.sh b/usr/local/share/bastille/template.sh
index 7af0419f..53f50bc0 100644
--- a/usr/local/share/bastille/template.sh
+++ b/usr/local/share/bastille/template.sh
@@ -188,17 +188,15 @@ case ${TEMPLATE} in
         ;;
     */*)
         if [ ! -d "${bastille_templatesdir}/${TEMPLATE}" ]; then
+            if [ ! -d ${TEMPLATE} ]; then
                 error_exit "${TEMPLATE} not found."
-        else
+            else
                 bastille_template=${TEMPLATE}
+            fi
         fi
         ;;
     *)
-        if [ ! -f ${TEMPLATE}/Bastillefile ]; then
-            error_exit "${TEMPLATE} not found."
-        else
-            bastille_template=${TEMPLATE}
-        fi
+        error_exit "Template name/URL not recognized."
 esac
 
 if [ -z "${JAILS}" ]; then