diff --git a/profiles/openatrium/modules/contrib/casetracker/casetracker.module b/profiles/openatrium/modules/contrib/casetracker/casetracker.module
index 874c947..40c8bb5 100755
--- a/profiles/openatrium/modules/contrib/casetracker/casetracker.module
+++ b/profiles/openatrium/modules/contrib/casetracker/casetracker.module
@@ -236,18 +236,23 @@ function casetracker_comment(&$comment, $op) {
   }
 
   if ($op == 'insert' || $op == 'update') {
-    $new = (object) $comment['casetracker'];
-    $new->cid = $comment['cid'];
-    $new->nid = $comment['nid'];
-    $new->vid = $comment['revision_id'];
-    $new->state = 1;
-    $new->assign_to = casetracker_get_uid($new->assign_to);
+    if (isset($comment['casetracker'])) {
+      $new = (object) $comment['casetracker'];
+      $new->cid = $comment['cid'];
+      $new->nid = $comment['nid'];
+      $new->vid = $comment['revision_id'];
+      $new->state = 1;
+      $new->assign_to = casetracker_get_uid($new->assign_to);
+    }
 
     // Populate old state values from node
     $old = $node->casetracker;
     $old->cid = $comment['cid'];
     $old->state = 0;
 
+    if (!isset($comment['casetracker'])) {
+      $new = $old;
+    }
     drupal_write_record('casetracker_case', $new, array('nid', 'vid'));
   }