--- a/app/soc/modules/ghop/logic/models/task.py	Wed Nov 04 21:37:44 2009 +0100
+++ b/app/soc/modules/ghop/logic/models/task.py	Sun Nov 08 11:54:44 2009 -0800
@@ -113,8 +113,10 @@
           # initialize history
           task_history = {}
       # extract the existing json history from the entity to update it
+    elif entity.history:
+      task_history = simplejson.loads(entity.history)
     else:
-      task_history = simplejson.loads(entity.history)
+      task_history = {}
 
       # we construct history for only changed entity properties
       if entity_properties: