Add error checking for the disk image name.  This is a common source of
confusion in our environment.

Also includes a number of whitespace changes courtesy of PyDev.