diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 7a0f55f75..b9b0b29bc 100644
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -3290,7 +3290,7 @@ zdb_vdev_lookup(vdev_t *vdev, char *path)
 		return (NULL);
 
 	vdev = vdev->vdev_child[i];
-	if (*s == '\0')
+	if (s && *s == '\0')
 		return (vdev);
 	return (zdb_vdev_lookup(vdev, s+1));
 
diff --git a/lib/libshare/nfs.c b/lib/libshare/nfs.c
index 58b4c8880..9d548dccc 100644
--- a/lib/libshare/nfs.c
+++ b/lib/libshare/nfs.c
@@ -532,8 +532,10 @@ nfs_is_share_active(sa_share_impl_t impl_share)
 
 	nfs_exportfs_temp_fp = fdopen(fd, "r");
 
-	if (nfs_exportfs_temp_fp == NULL ||
-	    fseek(nfs_exportfs_temp_fp, 0, SEEK_SET) < 0) {
+	if (nfs_exportfs_temp_fp == NULL)
+		return (B_FALSE);
+
+	if (fseek(nfs_exportfs_temp_fp, 0, SEEK_SET) < 0) {
 		fclose(nfs_exportfs_temp_fp);
 		return (B_FALSE);
 	}