Fix a couple of deprecations.
Extend Exception.catching block to include preceding argument-building logic.