Add Commenting around Exceptions