Index: b/usr/src/lib/libzfs/common/libzfs_dataset.c
===================================================================
--- a/usr/src/lib/libzfs/common/libzfs_dataset.c	2014-03-10 12:37:02.425815711 +0400
+++ b/usr/src/lib/libzfs/common/libzfs_dataset.c	2014-03-10 12:37:04.618872674 +0400
@@ -4041,7 +4041,7 @@
 	if (cmd == ZFS_SMB_ACL_RENAME) {
 		if (nvlist_alloc(&nvlist, NV_UNIQUE_NAME, 0) != 0) {
 			(void) no_memory(hdl);
-			return (NULL);
+			return (0);
 		}
 	}
 
Index: b/usr/src/lib/libzfs/common/libzfs_sendrecv.c
===================================================================
--- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c	2014-03-10 12:36:54.935778718 +0400
+++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c	2014-03-10 12:37:04.622296500 +0400
@@ -2718,7 +2718,7 @@
 			(void) printf("found clone origin %s\n", zc.zc_string);
 	}
 
-	stream_wantsnewfs = (drrb->drr_fromguid == NULL ||
+	stream_wantsnewfs = (drrb->drr_fromguid == 0 ||
 	    (drrb->drr_flags & DRR_FLAG_CLONE));
 
 	if (stream_wantsnewfs) {