Merge "Add scope to Exception class methods"