4 files changed, 19 insertions, 6 deletions
diff --git a/src/Bindings/AllToLua.pkg b/src/Bindings/AllToLua.pkg
index 37e6aecd2..73de98e22 100644
--- a/src/Bindings/AllToLua.pkg
+++ b/src/Bindings/AllToLua.pkg
@@ -27,6 +27,7 @@ $cfile "WebPlugin.h"
 $cfile "LuaWindow.h"
 
 $cfile "../BlockID.h"
+$cfile "../Mobs/MonsterTypes.h"
 $cfile "../BlockInfo.h"
 $cfile "../StringUtils.h"
 $cfile "../Defines.h"
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp
index ba2f3c5e0..85e3f9fc5 100644
--- a/src/Bindings/LuaState.cpp
+++ b/src/Bindings/LuaState.cpp
@@ -861,6 +861,11 @@ void cLuaState::GetStackValue(int a_StackPos, eWeather & a_ReturnedVal)
 
 void cLuaState::GetStackValue(int a_StackPos, pBoundingBox & a_ReturnedVal)
 {
+	if (lua_isnil(m_LuaState, a_StackPos))
+	{
+		a_ReturnedVal = NULL;
+		return;
+	}
 	tolua_Error err;
 	if (tolua_isusertype(m_LuaState, a_StackPos, "cBoundingBox", false, &err))
 	{
@@ -874,6 +879,11 @@ void cLuaState::GetStackValue(int a_StackPos, pBoundingBox & a_ReturnedVal)
 
 void cLuaState::GetStackValue(int a_StackPos, pWorld & a_ReturnedVal)
 {
+	if (lua_isnil(m_LuaState, a_StackPos))
+	{
+		a_ReturnedVal = NULL;
+		return;
+	}
 	tolua_Error err;
 	if (tolua_isusertype(m_LuaState, a_StackPos, "cWorld", false, &err))
 	{
@@ -1396,10 +1406,8 @@ void cLuaState::LogStack(const char * a_Header)
 
 void cLuaState::LogStack(lua_State * a_LuaState, const char * a_Header)
 {
-	UNUSED(a_Header);  // The param seems unused when compiling for release, so the compiler warns
-	
 	// Format string consisting only of %s is used to appease the compiler
-	LOGD("%s", (a_Header != NULL) ? a_Header : "Lua C API Stack contents:");
+	LOG("%s", (a_Header != NULL) ? a_Header : "Lua C API Stack contents:");
 	for (int i = lua_gettop(a_LuaState); i > 0; i--)
 	{
 		AString Value;
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index 094a200e0..ef87c3efc 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -304,7 +304,7 @@ public:
 	void ToString(int a_StackPos, AString & a_String);
 
 	/** Logs all the elements' types on the API stack, with an optional header for the listing. */
-	void LogStack(const char * a_Header);
+	void LogStack(const char * a_Header = NULL);
 	
 	/** Logs all the elements' types on the API stack, with an optional header for the listing. */
 	static void LogStack(lua_State * a_LuaState, const char * a_Header = NULL);
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index f4764447c..f643f06ec 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -697,8 +697,12 @@ static int tolua_ForEachInBox(lua_State * tolua_S)
 	Ty1 * Self = NULL;
 	cBoundingBox * Box = NULL;
 	L.GetStackValues(1, Self, Box);
-	ASSERT(Self != NULL);  // We have verified the type at the top, so we should get valid objects here
-	ASSERT(Box != NULL);
+	if ((Self == NULL) || (Box == NULL))
+	{
+		LOGWARNING("Invalid world (%p) or boundingbox (%p)", Self, Box);
+		L.LogStackTrace();
+		return 0;
+	}
 	
 	// Create a reference for the function:
 	cLuaState::cRef FnRef(L, 3);