Minor updates and corrected additional exception info