added null checks on swimmers