diff --git a/start-azurite b/start-azurite
index e02361e..5d3ee01 100755
--- a/start-azurite
+++ b/start-azurite
@@ -8,9 +8,9 @@ AZURITE_IMAGE="${AZURITE_IMAGE:-azurite:latest}"
 
 while [[ $# -gt 0 ]]; do
     case "$1" in
-        --no-oauth)
-            # OAuth support 
-            CONTAINER_ARGS+=("--no-oauth")
+        --no-oauth|--no-caddy)
+            # Pass these flags to the container, so that it can configure Azurite accordingly.
+            CONTAINER_ARGS+=("$1")
             shift
             ;;
         -d|--azurite-dir)
@@ -23,8 +23,8 @@ while [[ $# -gt 0 ]]; do
             fi
             ;;
         *)
-            CONTAINER_ARGS+=("$1")
-            shift
+            echo "Error: Unknown argument: $1" >&2
+            exit 1
             ;;
     esac
 done