Fixes NPE In TeamManager