Fixed "return" inside "catch" construction