diff --git a/ChangeLog b/ChangeLog
index b4a81f996..962caf079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20130123
+ - (tim) [session.c] Improve error reporting on set_id().
+
 20130122
  - (djm) [openbsd-compat/setproctitle.c] Don't fail to compile if a
    platform that is expected to use the reuse-argv style setproctitle
diff --git a/session.c b/session.c
index 6be16ca86..12dd9ab10 100644
--- a/session.c
+++ b/session.c
@@ -1554,7 +1554,7 @@ do_setusercontext(struct passwd *pw)
 #else
 # ifdef USE_LIBIAF
 	if (set_id(pw->pw_name) != 0) {
-		exit(1);
+		fatal("set_id(%s) Failed", pw->pw_name);
 	}
 # endif /* USE_LIBIAF */
 		/* Permanently switch to the desired uid. */