Volume ownership check - fixes 584

Fixes #584.
"Suboptimal" is my middle name - in what way specifically?