Add Exceptions and Comments