diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index 041b1195e..25506a877 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -381,7 +381,7 @@ void DMenu::Ticker ()
 DEFINE_ACTION_FUNCTION(DMenu, Ticker)
 {
 	PARAM_SELF_PROLOGUE(DMenu);
-	self->Drawer();
+	self->Ticker();
 	return 0;
 }
 
@@ -392,7 +392,7 @@ void DMenu::CallTicker()
 		VMValue params[] = { (DObject*)this };
 		GlobalVMStack.Call(func, params, 1, nullptr, 0, nullptr);
 	}
-	else Drawer();
+	else Ticker();
 }
 
 
diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp
index 9aff4350a..057f544c5 100644
--- a/src/menu/menudef.cpp
+++ b/src/menu/menudef.cpp
@@ -796,7 +796,10 @@ static void ParseOptionMenuBody(FScanner &sc, DOptionMenuDescriptor *desc)
 							auto cv = FindCVar(sc.String, nullptr);
 							if (cv == nullptr && *sc.String)
 							{
-								sc.ScriptError("Unknown CVar %s", sc.String);
+									if (func->Variants[0].ArgFlags[i] & VARF_Optional)
+										sc.ScriptMessage("Unknown CVar %s", sc.String);
+									else
+										sc.ScriptError("Unknown CVar %s", sc.String);
 							}
 							params.Push(cv);
 						}