diff --git a/.gitmodules b/.gitmodules
index c1f89e94..fb54e5a5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "TerrariaServerAPI"]
 	path = TerrariaServerAPI
 	url = https://github.com/Deathmax/TerrariaAPI-Server.git
+	ignore = dirty
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index b0b56eb6..08522edb 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -2830,7 +2830,7 @@ namespace TShockAPI
 			var b = args.Data.ReadInt8();
 			var name = "";
 
-			if (b <= 20)
+			if (b != 0 && b <= 20)
 				name = args.Data.ReadString();
 
 			args.Player.ActiveChest = id;
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index 41473d9c..e3a885b1 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit 41473d9c8bfadbd14fca2e917c8299903827eae5
+Subproject commit e3a885b1bda4ce369ba58ec1cd7f5dd10fcd3444