diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 2a8ffb0897..4741fb2e74 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -577,7 +577,7 @@ class addressbook_sql extends so_sql_cf
 		// Change autoinc_id to match $this->db_cols
 		$this->autoinc_id = $this->db_cols[$this->autoinc_id];
 		if(($id = (int)$this->data[$this->autoinc_id]) && $cfs = $this->read_customfields($keys)) {
-			$contact = array_merge($contact,$cfs[$id]);
+			if (is_array($cfs[$id])) $contact = array_merge($contact,$cfs[$id]);
 		}
 		$this->autoinc_id = array_search($this->autoinc_id, $this->db_cols);
 
diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index dd92e17115..121686a08f 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -1449,7 +1449,7 @@ class addressbook_ui extends addressbook_bo
 			}
 			else
 			{
-				$content['link_to']['to_id'] = $contact_id;
+				if (is_int($contact_id)) $content['link_to']['to_id'] = $contact_id;
 			}
 			// automatic link new entries to entries specified in the url
 			if (!$contact_id && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']) && !is_array($content['link_to']['to_id']))