Scopes the error handler with the component
Merge remote-tracking branch 'origin/develop' into develop