Merge "Don't install a custom error handler for hooks"