Fix comparison of default error handler

Also improve clarity a bit