Add more complete check.
Move responsibility for creating a set to different method.