diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py
index 8489d4dec8ce6017f5c77f0bc9efd0ddc56efb9b..f2abd0ebc120aa7e089ca9112fc314f30f798689 100644
--- a/image_creator/os_type/unix.py
+++ b/image_creator/os_type/unix.py
@@ -92,7 +92,9 @@ class Unix(OSBase):
     def cleanup_userdata(self, print_header=True):
         """Delete sensitive userdata"""
 
-        homedirs = ['/root'] + self.ls('/home/')
+        homedirs = ['/root']
+        if self.g.is_dir('/home/'):
+            homedirs += self.ls('/home/')
 
         if print_header:
             self.out.output("Removing sensitive user data under %s" %