Add check for null player