bugzid 5035: fixed NPE on volume remove
Merge pull request #52 from daniellemayne/develop

bugzid 5035: fixed NPE on volume remove