1 files changed, 6 insertions, 8 deletions
diff --git a/Sluift/client.cpp b/Sluift/client.cpp
index 1cdd8d7..8dcd9ae 100644
--- a/Sluift/client.cpp
+++ b/Sluift/client.cpp
@@ -464,9 +464,10 @@ SLUIFT_LUA_FUNCTION_WITH_HELP(
 		"See help('MAMQuery') for details."
 ) {
-	if (!lua_istable(L, 2)) {
-		throw Lua::Exception("Missing MAMQuery");
+	Lua::checkType(L, 2, LUA_TTABLE);
+	boost::shared_ptr<MAMQuery> mamQuery = boost::make_shared<MAMQuery>();
+	lua_getfield(L, 2, "mam_query");
+	if (lua_istable(L, -1)) {
+		mamQuery = boost::dynamic_pointer_cast<MAMQuery>(Sluift::globals.elementConvertor.convertFromLuaUntyped(L, -1, "mam_query"));
 	}
-	if (boost::shared_ptr<MAMQuery> mamQuery = boost::dynamic_pointer_cast<MAMQuery>(Sluift::globals.elementConvertor.convertFromLuaUntyped(L, 2, "mam_query"))) {
-			IQRouter *router = getClient(L)->getClient()->getIQRouter();
 	JID jid;
 	lua_getfield(L, 2, "jid");
@@ -474,9 +475,6 @@ SLUIFT_LUA_FUNCTION_WITH_HELP(
 		jid = JID(lua_tostring(L, -1));
 	}
+	IQRouter *router = getClient(L)->getClient()->getIQRouter();
 	router->sendIQ(IQ::createRequest(IQ::Set, jid, IDGenerator().generateID(), mamQuery));
-	}
-	else {
-		throw Lua::Exception("Illegal MAMQuery");
-	}
 	return 0;
 }