diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs
index 6770ffc4..2610875e 100755
--- a/TShockAPI/DB/UserManager.cs
+++ b/TShockAPI/DB/UserManager.cs
@@ -168,7 +168,7 @@ namespace TShockAPI.DB
 					throw new UserNotExistException(user.Name);
 				
 				// Update player group reference for any logged in player
-				foreach (var player in TShock.Players.Where(p => null != p && p.User.Name == user.Name))
+				foreach (var player in TShock.Players.Where(p => p != null && p.User != null && p.User.Name == user.Name))
 				{
 					player.Group = grp;
 				}