Index: trunk/packages/invirt-dev/invirtibuilder
===================================================================
--- trunk/packages/invirt-dev/invirtibuilder	(revision 2837)
+++ trunk/packages/invirt-dev/invirtibuilder	(revision 2838)
@@ -336,8 +336,4 @@
 
                     db.failed_stage = 'cleaning up'
-
-                # Finally, now that everything is done, remove the
-                # build queue item
-                os.unlink(os.path.join(b._QUEUE_DIR, build))
         except:
             db.traceback = traceback.format_exc()
@@ -349,4 +345,8 @@
             database.session.commit()
 
+            # Finally, now that everything is done, remove the
+            # build queue item
+            os.unlink(os.path.join(b._QUEUE_DIR, build))
+
             reportBuild(db)