Add missing return statement on errorhandler case.
Add provider to package, touch up readability.