Fixed exception issues.