Volume ownership check - fixes 584

Fixes #584.
This seems somewhat suboptimal.