diff --git a/README b/README
index c0c03f2d..cf54ca8e 100644
--- a/README
+++ b/README
@@ -59,6 +59,7 @@ Dave Hagewood <admin@arrowweb.com>
 David A. Holland <dholland@hcs.harvard.edu>
 David Frey <David.Frey@lugs.ch>
 Ed Carp <ecarp@netcom.com>
+Ed Neville <ed@s5h.net>
 Eric W. Biederman" <ebiederm@xmission.com>
 Floody <flood@evcom.net>
 Frank Denis <j@4u.net>
diff --git a/src/faillog.c b/src/faillog.c
index 1309dad4..3ab48db3 100644
--- a/src/faillog.c
+++ b/src/faillog.c
@@ -163,6 +163,10 @@ static void print_one (/*@null@*/const struct passwd *pw, bool force)
 	}
 
 	tm = localtime (&fl.fail_time);
+	if (!tm) {
+		fprintf (stderr, "Cannot read time from faillog.\n");
+		exit (EXIT_FAILURE);
+	}
 #ifdef HAVE_STRFTIME
 	strftime (ptime, sizeof (ptime), "%D %H:%M:%S %z", tm);
 	cp = ptime;