Index: /package_branches/invirt-web/cherrypy/code/controls.py
===================================================================
--- /package_branches/invirt-web/cherrypy/code/controls.py	(revision 2519)
+++ /package_branches/invirt-web/cherrypy/code/controls.py	(revision 2520)
@@ -209,7 +209,5 @@
     machine = validation.Validate(username, state, machine_id=machine_id).machine
     action = command_name
-    cdrom = fields.get('cdrom')
-    if not cdrom:
-        cdrom = None
+    cdrom = fields.get('cdrom') or None
     if cdrom is not None and not CDROM.query().filter_by(cdrom_id=cdrom).one():
         raise CodeError("Invalid cdrom type '%s'" % cdrom)