Remove broad rescue [#46751287]