diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 42c470f4..2735161a 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -409,17 +409,19 @@ namespace TShockAPI
 				KnownIps = JsonConvert.DeserializeObject<List<String>>(args.Player.User.KnownIps);
 			}
 
-			bool last = KnownIps.Last() == args.Player.IP;
-			if (!last)
+			if (KnownIps.Count > 0)
 			{
-				if (KnownIps.Count == 100)
+				bool last = KnownIps.Last() == args.Player.IP;
+				if (!last)
 				{
-					KnownIps.RemoveAt(0);
+					if (KnownIps.Count == 100)
+					{
+						KnownIps.RemoveAt(0);
+					}
+
+					KnownIps.Add(args.Player.IP);
 				}
-
-				KnownIps.Add(args.Player.IP);
 			}
-
 			args.Player.User.KnownIps = JsonConvert.SerializeObject(KnownIps, Formatting.Indented);
 			Users.UpdateLogin(args.Player.User);
 		}
@@ -1170,7 +1172,7 @@ namespace TShockAPI
 		{
 			if (args.Handled)
 				return;
-			
+
 			if (!Config.AllowCrimsonCreep && (args.Type == TileID.Dirt || args.Type == TileID.FleshWeeds
 				|| TileID.Sets.Crimson[args.Type]))
 			{