adding exceptions and fixing a comment