Added checks for disk to be (un)mounted