Extend error handling in volumes