--- a/usr/src/lib/libzfs/common/libzfs_dataset.c	Wed Mar 17 16:34:34 2010 -0600
+++ b/usr/src/lib/libzfs/common/libzfs_dataset.c	Sat Mar 20 13:03:54 2010 -0700
@@ -459,7 +459,9 @@
 	else
 		abort();	/* we should never see any other types */
 
-	zhp->zpool_hdl = zpool_handle(zhp);
+	if ((zhp->zpool_hdl = zpool_handle(zhp)) == NULL)
+		return (-1);
+
 	return (0);
 }