Merge "throw correct exception"