Merge "add codes for exception"