diff --git a/auth2.c b/auth2.c
index 08ea2a802..14634c992 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.140 2017/05/30 14:29:59 markus Exp $ */
+/* $OpenBSD: auth2.c,v 1.141 2017/05/31 05:34:14 markus Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -172,7 +172,7 @@ do_authentication2(Authctxt *authctxt)
 	ssh->authctxt = authctxt;		/* XXX move to caller */
 	ssh_dispatch_init(ssh, &dispatch_protocol_error);
 	ssh_dispatch_set(ssh, SSH2_MSG_SERVICE_REQUEST, &input_service_request);
-	ssh_dispatch_run(ssh, DISPATCH_BLOCK, &authctxt->success, ssh);
+	ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &authctxt->success, ssh);
 	ssh->authctxt = NULL;
 }