diff --git a/CHANGELOG b/CHANGELOG
index 3ff98f523..4103ea787 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 
 Nmap 6.20BETA1 [2012-11-16]
 
+o Added some new checks for failed library calls. [Bill Parker]
+
 o Integrated all of your IPv4 OS fingerprint submissions since January
   (more than 3,000 of them).  Added 373 fingerprints, bringing the new
   total to 3,946.  Additions include Linux 3.6, Windows 8, Windows
diff --git a/nmap.cc b/nmap.cc
index 5db435975..41c6673ee 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -2336,7 +2336,9 @@ int gather_logfile_resumption_state(char *fname, int *myargc, char ***myargv) {
 
   /* Ensure the log file ends with a newline */
   filestr[filelen - 1] = '\n';
-  munmap(filestr, filelen);
+  if (munmap(filestr, filelen) != 0)
+    gh_perror("%s: error in munmap(%p, %u)", __func__, filestr, filelen);
+
   return 0;
 }