Merge "Fix exception definition"