Merge "Fix crash when debugging exception"