--- a/src/modules/client/api.py	Thu Apr 28 11:44:04 2011 -0700
+++ b/src/modules/client/api.py	Tue Nov 09 13:27:02 2010 -0800
@@ -880,7 +880,8 @@
                         self.__finished_execution(be)
                 finally:
                         self.__img.cleanup_downloads()
-                        self.__img.unlock()
+                        if self.__img.locked:
+                                self.__img.unlock()
                         self.__activity_lock.release()
 
         def __finished_execution(self, be):