diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index d0c32fca..5b496675 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -422,15 +422,18 @@ namespace TShockAPI
 		public List<int> GetBuffByName(string name)
 		{
 			string nameLower = name.ToLower();
+			string buffname;
 			for (int i = 1; i < Main.maxBuffTypes; i++)
 			{
-				if (Main.buffName[i].ToLower() == nameLower)
+				buffname = Main.buffName[i];
+				if (!String.IsNullOrWhiteSpace(buffname) && buffname.ToLower() == nameLower)
 					return new List<int> {i};
 			}
 			var found = new List<int>();
 			for (int i = 1; i < Main.maxBuffTypes; i++)
 			{
-				if (Main.buffName[i].ToLower().StartsWith(nameLower))
+				buffname = Main.buffName[i];
+				if (!String.IsNullOrWhiteSpace(buffname) && buffname.ToLower().StartsWith(nameLower))
 					found.Add(i);
 			}
 			return found;
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index d0bd38b5..88e0fd4a 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit d0bd38b5b12a6c0cb4cc54706550e94153856ce4
+Subproject commit 88e0fd4a73e944e8e0cdc3f05eb2dfc616bc8149