d9e8ce22cb
Necessary to preserve type information. The try/catch sequence didn't
work previously.
Same fix as in commit 1c904000