Volume ownership check - fixes 584

Fixes #584.
Huh this code too.