diff --git a/data/client b/data/client
index f9265e0..caffc58 100644
--- a/data/client
+++ b/data/client
@@ -30,7 +30,14 @@ start() {
 }
 stop(){
 	ebegin "Unmount domain resources"
-	umount /var/calculate/remote
+	if mount | grep ' /var/calculate/remote ';
+		then
+			umount /var/calculate/remote
+	fi
+	if mount | grep '/var/calculate/client-home on /home ';
+		then
+			umount /home
+	fi
 }
 
 # vim:ts=4