Added returns in catch blocks