appease the linter
refactor to use trycatcher (for now) and move shim to lib