Merge "add codes for exception"

No match.