Refactoring. Moves throw error to invoker. Globally