Merge "Remove catch clause on compat shim"