diff --git a/buildpkg.functions b/buildpkg.functions
index ff52074..332cbf8 100644
--- a/buildpkg.functions
+++ b/buildpkg.functions
@@ -310,7 +310,7 @@ clean()
 			    META_CLEAN="$META_CLEAN prototype.$secname pkginfo.$secname"
 			    pkgname=$(get_pkgname $secname)
 			    echo "Removing $buildpkgbase/$pkgdir/$pkgname"
-			    $RM -rf $buildpkgbase/$pkgdir/$pkgname
+			    [ ! -z "$pkgname" ] && $RM -rf $buildpkgbase/$pkgdir/$pkgname
 			done
 		    fi
 
diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index fa60387..aef9dd4 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -404,9 +404,11 @@ get_pkgname()
 {
     local secname=$1
 
-    local pn=$($GREP PKG $metadir/pkginfo.$secname)
-    local pname=$(_upls ${pn##PKG=})
-    echo $pname
+    if [ -r $metadir/pkginfo.$secname ]; then
+	local pn=$($GREP PKG $metadir/pkginfo.$secname)
+	local pname=$(_upls ${pn##PKG=})
+	echo $pname
+    fi
 }
 
 # get_pkgrev(): Extract pkgrev (REV part of VERSION field) from pkginfo file