Make error-handler a separate option