diff --git a/docker/init-docker b/docker/init-docker
index db4d7cb..f9c4a52 100755
--- a/docker/init-docker
+++ b/docker/init-docker
@@ -24,7 +24,7 @@ function mp() {
         set +e
         mountpoint -q $1
         local mp=$?
-        set -
+        set -e
 	return ${mp}
 }
 
@@ -76,9 +76,11 @@ if [ -z "$@" ]; then
 			echo "- Processing SCHEMA modify item [${f}]"
 			slapmodify -b cn=config -l ${f}
 		done
+		shopt -u nullglob
 
 		# Add custom data definitions
 		for i in 01 03 04 05 06 07; do
+			ls -al ${SLAPD_SCHEMA_BASE}/data.d/${i}-* >/dev/null 2>&1 || continue
 			echo "- Processing DATABASE item(s) for DB [${i}]"
 			cat ${SLAPD_SCHEMA_BASE}/data.d/${i}-* | slapadd -n ${i}
 		done