Better error handling around volume delete.

fixes bug 1130844

Change-Id: I6886bff24194c2ace3d7719b93b5ab79aa8a0e8d
Merge "Better error handling around volume delete."