Add preparation for provider (bug 942361)

``return app.error...`` to be safe? When adding code to this later.