Index: vws
==================================================================
--- vws
+++ vws
@@ -180,11 +180,11 @@
         if options.snapshot:
             arg = arg+" -snapshot"
         if options.args:
             arg = arg + " " + "".join(options.args)
         if options.password:
-            os.environ["SPICE_PASSWORD"]=options.password
+            os.environ["SPICE_PASSWORD"]=options.password[0]
         print arg
         cwd = os.getcwd()
         os.chdir(options.dir)
         # Check for snapshot
         nxt = 0
@@ -586,19 +586,20 @@
         start_opts = Namespace(machine = name,
                 command = 'start',
                 dir = machine_dir,
                 snapshot = False,
                 stopped = True,
+		password = None,
                 args = "",
                 gui = False,
                 cdrom = None)
         try:
             cmd_start(start_opts)
             print name," ",
         finally:
             # pylint: disable=no-member
-            if start_opts.sock:
+            if hasattr(start_opts,"sock") and start_opts.sock:
                 start_opts.sock.shutdown(socket.SHUT_RDWR)
     print ""
 
 def cmd_shutdown(options):
     """ Search for all running machines and stops all of them """