diff --git a/module/bug/model.php b/module/bug/model.php
index cd81273fda..8665187821 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -675,18 +675,18 @@ class bugModel extends model
                 if($data->types[$bugID]       == 'ditto') $data->types[$bugID]       = isset($prev['type'])       ? $prev['type']       : '';
                 if($data->severities[$bugID]  == 'ditto') $data->severities[$bugID]  = isset($prev['severity'])   ? $prev['severity']   : 3;
                 if($data->pris[$bugID]        == 'ditto') $data->pris[$bugID]        = isset($prev['pri'])        ? $prev['pri']        : 0;
-                if($data->branches[$bugID]    == 'ditto') $data->branches[$bugID]    = isset($prev['branch'])     ? $prev['branch'] : 0;
                 if($data->plans[$bugID]       == 'ditto') $data->plans[$bugID]       = isset($prev['plan'])       ? $prev['plan'] : '';
                 if($data->assignedTos[$bugID] == 'ditto') $data->assignedTos[$bugID] = isset($prev['assignedTo']) ? $prev['assignedTo'] : '';
                 if($data->resolvedBys[$bugID] == 'ditto') $data->resolvedBys[$bugID] = isset($prev['resolvedBy']) ? $prev['resolvedBy'] : '';
                 if($data->resolutions[$bugID] == 'ditto') $data->resolutions[$bugID] = isset($prev['resolution']) ? $prev['resolution'] : '';
                 if($data->os[$bugID]          == 'ditto') $data->os[$bugID]          = isset($prev['os'])         ? $prev['os'] : '';
                 if($data->browsers[$bugID]    == 'ditto') $data->browsers[$bugID]    = isset($prev['browser'])    ? $prev['browser'] : '';
+                if(isset($data->branches[$bugID]) and $data->branches[$bugID] == 'ditto') $data->branches[$bugID] = isset($prev['branch'])     ? $prev['branch'] : 0;
 
                 $prev['type']       = $data->types[$bugID];
                 $prev['severity']   = $data->severities[$bugID];
                 $prev['pri']        = $data->pris[$bugID];
-                $prev['branch']     = $data->branches[$bugID];
+                $prev['branch']     = isset($data->branches[$bugID]) ? $data->branches[$bugID] : '';
                 $prev['plan']       = $data->plans[$bugID];
                 $prev['assignedTo'] = $data->assignedTos[$bugID];
                 $prev['resolvedBy'] = $data->resolvedBys[$bugID];
diff --git a/module/webhook/model.php b/module/webhook/model.php
index 1de75bb4e8..6097530ace 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -78,7 +78,14 @@ class webhookModel extends model
             $action = $actions[$log->action];
             $data   = json_decode($log->data);
             $object = $this->dao->select('*')->from($this->config->objectTables[$action->objectType])->where('id')->eq($action->objectID)->fetch();
-            $field  = $this->config->action->objectNameFields[$action->objectType];
+            $field  = zget($this->config->action->objectNameFields, $action->objectType, $action->objectType);
+
+            if(!is_object($object)) 
+            {
+                $object = new stdclass;
+                $object->$field = '';
+            }
+
             $text   = zget($users, $data->user, $this->app->user->realname) . $this->lang->action->label->{$action->action} . $this->lang->action->objectTypes[$action->objectType] . "[#{$action->objectID}::{$object->$field}]";
 
             $log->action    = $text;