diff --git a/DockerEntrypoint.sh b/DockerEntrypoint.sh
index 7256f980..cb907616 100644
--- a/DockerEntrypoint.sh
+++ b/DockerEntrypoint.sh
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+if [ -z "$GEODATA_DIR" ]; then
+  echo "ERROR: GEODATA_DIR environment variable is not set"
+  exit 1
+fi
+
+if [ -z "$MAX_GEODATA_DIR_WAIT" ]; then
+  echo "WARNING: MAX_GEODATA_DIR_WAIT environment variable is not set, using default MAX_GEODATA_DIR_WAIT=300"
+  MAX_GEODATA_DIR_WAIT=300
+fi
+
 FINISH_FILE="$GEODATA_DIR/cron-job-finished.txt"
 
 ELAPSED=0
diff --git a/docker-compose.yml b/docker-compose.yml
index 1ef55861..137ac605 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       XRAY_VMESS_AEAD_FORCED: "false"
       XUI_ENABLE_FAIL2BAN: "true"
       GEODATA_DIR: "/app/bin"
-      MAX_GEODATA_DIR_WAIT: 300 #5 minutes
+      MAX_GEODATA_DIR_WAIT: 300 # 5 minutes
     tty: true
     network_mode: host
     restart: unless-stopped