I think you are right, the current IllegalArgumentException seems too much. null values should jsut be ignored.