More refactoring
Using VSphereException to clean up a bit