Index: user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh	(revision 293020)
+++ user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh	(revision 293021)
@@ -1,18 +1,20 @@
 #!/bin/sh
 # $FreeBSD$
 
 class="uzip"
 base=`basename $0`
 
 uzip_test_cleanup()
 {
-	umount $mntpoint
-	rmdir $mntpoint
+	if [ -n "$mntpoint" ]; then
+		umount $mntpoint
+		rmdir $mntpoint
+	fi
 	geom_test_cleanup
 }
 trap uzip_test_cleanup ABRT EXIT INT TERM
 
 . `dirname $0`/../geom_subr.sh
 
 # NOTE: make sure $TMPDIR has been set by geom_subr.sh if unset [by kyua, etc]
 mntpoint=$(mktemp -d tmp.XXXXXX) || exit