Added some additional checking and more forceful unmounting.