diff --git a/src/lua/LuaButton.cpp b/src/lua/LuaButton.cpp
index 16700bb4b..00a7e01ac 100644
--- a/src/lua/LuaButton.cpp
+++ b/src/lua/LuaButton.cpp
@@ -62,8 +62,7 @@ int LuaButton::text(lua_State * l)
 	int args = lua_gettop(l);
 	if(args)
 	{
-		luaL_checktype(l, 1, LUA_TSTRING);
-		button->SetText(ByteString(lua_tostring(l, 1)).FromUtf8());
+		button->SetText(ByteString(luaL_checkstring(l, 1)).FromUtf8());
 		return 0;
 	}
 	else
diff --git a/src/lua/LuaCheckbox.cpp b/src/lua/LuaCheckbox.cpp
index 8766e65d5..f40c9c75d 100644
--- a/src/lua/LuaCheckbox.cpp
+++ b/src/lua/LuaCheckbox.cpp
@@ -60,7 +60,7 @@ int LuaCheckbox::text(lua_State * l)
 	int args = lua_gettop(l);
 	if(args)
 	{
-		checkbox->SetText(ByteString(lua_tostring(l, 1)).FromUtf8());
+		checkbox->SetText(ByteString(luaL_checkstring(l, 1)).FromUtf8());
 		return 0;
 	}
 	else
diff --git a/src/lua/LuaLabel.cpp b/src/lua/LuaLabel.cpp
index 8c321bbe5..deb333471 100644
--- a/src/lua/LuaLabel.cpp
+++ b/src/lua/LuaLabel.cpp
@@ -37,7 +37,7 @@ int LuaLabel::text(lua_State * l)
 	int args = lua_gettop(l);
 	if(args)
 	{
-		label->SetText(ByteString(lua_tostring(l, 1)).FromUtf8());
+		label->SetText(ByteString(luaL_checkstring(l, 1)).FromUtf8());
 		return 0;
 	}
 	else
diff --git a/src/lua/LuaProgressBar.cpp b/src/lua/LuaProgressBar.cpp
index ea177ce4d..bc4d9cdb9 100644
--- a/src/lua/LuaProgressBar.cpp
+++ b/src/lua/LuaProgressBar.cpp
@@ -53,7 +53,7 @@ int LuaProgressBar::status(lua_State * l)
 	int args = lua_gettop(l);
 	if(args)
 	{
-		progressBar->SetStatus(ByteString(lua_tostring(l, 1)).FromUtf8());
+		progressBar->SetStatus(ByteString(luaL_checkstring(l, 1)).FromUtf8());
 		return 0;
 	}
 	else
diff --git a/src/lua/LuaTextbox.cpp b/src/lua/LuaTextbox.cpp
index 9d0c05325..57dd475db 100644
--- a/src/lua/LuaTextbox.cpp
+++ b/src/lua/LuaTextbox.cpp
@@ -77,7 +77,7 @@ int LuaTextbox::text(lua_State * l)
 	int args = lua_gettop(l);
 	if(args)
 	{
-		textbox->SetText(ByteString(lua_tostring(l, 1)).FromUtf8());
+		textbox->SetText(ByteString(luaL_checkstring(l, 1)).FromUtf8());
 		return 0;
 	}
 	else