Remove try/catch behaviour and add tests from es6-shim