diff --git a/modules.d/40nfsroot/nfsroot-cleanup.sh b/modules.d/40nfsroot/nfsroot-cleanup.sh
index 7bdec0ac..4e0d7ad4 100644
--- a/modules.d/40nfsroot/nfsroot-cleanup.sh
+++ b/modules.d/40nfsroot/nfsroot-cleanup.sh
@@ -6,4 +6,11 @@ pid=$(pidof rpc.statd)
 pid=$(pidof rpcbind)
 [ -n "$pid" ] && kill $pid
 
-mount --move /var/lib/nfs/rpc_pipefs $NEWROOT/var/lib/nfs/rpc_pipefs
+mkdir -p 
+
+if [ -d $NEWROOT/var/lib/nfs/rpc_pipefs ]; then
+    mount --move /var/lib/nfs/rpc_pipefs $NEWROOT/var/lib/nfs/rpc_pipefs
+else
+    umount /var/lib/nfs/rpc_pipefs
+fi
+