Fix for #92 and #94

This fixes:
#92
#94

Testing with:
disks unset:
disks invalid:
````