Start making exception catching more specific, as suggested by @mdboom