diff --git a/changes-entries/github 310.txt b/changes-entries/github 310.txt
new file mode 100644
index 00000000000..2d966cd488d
--- /dev/null
+++ b/changes-entries/github 310.txt	
@@ -0,0 +1,3 @@
+  *) core: Report invalid Options= argument when parsing AllowOverride
+     directives.
+     Github #310 [Zhou Qingyang <zhou1615 umn.edu>]
diff --git a/server/core.c b/server/core.c
index a27769f3d31..cfd3c7915e6 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1838,8 +1838,10 @@ static const char *set_override(cmd_parms *cmd, void *d_, const char *l)
         }
         else if (!ap_cstr_casecmp(k, "Options")) {
             d->override |= OR_OPTIONS;
-            if (v)
-                set_allow_opts(cmd, &(d->override_opts), v);
+            if (v) {
+                if ((err = set_allow_opts(cmd, &(d->override_opts), v)) != NULL)
+                    return err;
+            }
             else
                 d->override_opts = OPT_ALL;
         }