Merge "Must return after throwing exception"