Add better mount point checking