diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index 4d7e0bfb4d..0105e153b7 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -510,12 +510,12 @@ class OptionRowHandlerLua : public OptionRowHandler
 public:
 	LuaExpression *m_pLuaTable;
 
-	OptionRowHandlerLua::OptionRowHandlerLua() { m_pLuaTable = NULL; Init(); }
+	OptionRowHandlerLua() { m_pLuaTable = new LuaExpression; Init(); }
+	virtual ~OptionRowHandlerLua() { delete m_pLuaTable; }
 	void Init()
 	{
 		OptionRowHandler::Init();
-		delete m_pLuaTable;
-		m_pLuaTable = new LuaExpression;
+		m_pLuaTable->Unset();
 	}
 	virtual void Load( OptionRowDefinition &defOut, CString sLuaFunction )
 	{