Index: lib/libkvm/kvm.c
===================================================================
--- lib/libkvm/kvm.c
+++ lib/libkvm/kvm.c
@@ -69,6 +69,9 @@
 char *
 kvm_geterr(kvm_t *kd)
 {
+
+	if (kd == NULL)
+		return (NULL);
 	return (kd->errbuf);
 }
 
@@ -272,6 +275,10 @@
 {
 	int error = 0;
 
+	if (kd == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
 	if (kd->vmst != NULL)
 		kd->arch->ka_freevtop(kd);
 	if (kd->pmfd >= 0)
Index: lib/libkvm/kvm_geterr.3
===================================================================
--- lib/libkvm/kvm_geterr.3
+++ lib/libkvm/kvm_geterr.3
@@ -32,7 +32,7 @@
 .\"     @(#)kvm_geterr.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd March 15, 2017
 .Dt KVM_GETERR 3
 .Os
 .Sh NAME
@@ -54,6 +54,16 @@
 The string returned is stored in memory owned by
 .Xr kvm 3
 so the message should be copied out and saved elsewhere if necessary.
+.Sh RETURN VALUES
+.Fn kvm_geterr
+will return
+.Dv NULL
+if
+.Fa *kd
+was
+.Dv NULL
+or an error has not been captured for
+.Fa *kd .
 .Sh SEE ALSO
 .Xr kvm 3 ,
 .Xr kvm_close 3 ,
Index: lib/libkvm/kvm_open.3
===================================================================
--- lib/libkvm/kvm_open.3
+++ lib/libkvm/kvm_open.3
@@ -32,7 +32,7 @@
 .\"     @(#)kvm_open.3	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD$
 .\"
-.Dd November 27, 2015
+.Dd March 15, 2017
 .Dt KVM_OPEN 3
 .Os
 .Sh NAME
@@ -227,10 +227,29 @@
 write the error message into
 .Fa errbuf .
 .Pp
+.Rv -std kvm_close
+.Sh ERRORS
 The
 .Fn kvm_close
-function returns 0 on success and -1 on failure.
+function may fail and set
+.Va errno
+for any errors specified in
+.Xr close 2 .
+.Pp
+The
+.Fn kvm_close
+function may also fail and set
+.Va errno
+if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The value passed via
+.Fa *kd
+was
+.Dv NULL .
+.El
 .Sh SEE ALSO
+.Xr close 2 ,
 .Xr open 2 ,
 .Xr kvm 3 ,
 .Xr kvm_getargv 3 ,