Merge "Correct reraising of exception"