Changed null value for empty list + removed unnecessary null checks
Sweet relative fitness, bro