2 files changed, 16 insertions, 4 deletions

diff --git a/Server/Plugins/Debuggers/Debuggers.lua b/Server/Plugins/Debuggers/Debuggers.lua
index 02510c866..da375cdff 100644
--- a/Server/Plugins/Debuggers/Debuggers.lua
+++ b/Server/Plugins/Debuggers/Debuggers.lua
@@ -2026,22 +2026,24 @@ end
 
 function HandleConsoleTestJson(a_Split, a_EntireCmd)
 	LOG("Testing Json parsing...")
-	local t1 = cJson:Parse([[{"a": 1, "b": "2", "c": [3, "4", 5] }]])
+	local t1 = cJson:Parse([[{"a": 1, "b": "2", "c": [3, "4", 5], "d": true }]])
 	assert(t1.a == 1)
 	assert(t1.b == "2")
 	assert(t1.c[1] == 3)
 	assert(t1.c[2] == "4")
 	assert(t1.c[3] == 5)
-	
+	assert(t1.d == true)
+	LOG("Json parsing example 1 successful")
+
 	local t2, msg = cJson:Parse([[{"some": invalid, json}]])
 	assert(t2 == nil)
 	assert(type(msg) == "string")
-	LOG("Error message returned: " .. msg)
+	LOG("Json parsing an invalid string: Error message returned: " .. msg)
 	
 	LOG("Json parsing test succeeded")
 	
 	LOG("Testing Json serializing...")
-	local s1 = cJson:Serialize({a = 1, b = "2", c = {3, "4", 5}}, {indentation = " "})
+	local s1 = cJson:Serialize({a = 1, b = "2", c = {3, "4", 5}, d = true}, {indentation = " "})
 	LOG("Serialization result: " .. (s1 or "<nil>"))
 	LOG("Json serializing test succeeded")
 	
diff --git a/src/Bindings/LuaJson.cpp b/src/Bindings/LuaJson.cpp
index 4fa16273c..39a720319 100644
--- a/src/Bindings/LuaJson.cpp
+++ b/src/Bindings/LuaJson.cpp
@@ -160,6 +160,16 @@ static Json::Value JsonSerializeValue(cLuaState & a_LuaState)
 {
 	switch (lua_type(a_LuaState, -1))
 	{
+		case LUA_TBOOLEAN:
+		{
+			bool v;
+			a_LuaState.GetStackValue(-1, v);
+			return Json::Value(v);
+		}
+		case LUA_TNIL:
+		{
+			return Json::Value(Json::nullValue);
+		}
 		case LUA_TNUMBER:
 		{
 			lua_Number v;