diff --git a/admin/inc/class.admin_cmd_customfield.inc.php b/admin/inc/class.admin_cmd_customfield.inc.php
index 69cc696170..e859f001dc 100644
--- a/admin/inc/class.admin_cmd_customfield.inc.php
+++ b/admin/inc/class.admin_cmd_customfield.inc.php
@@ -89,7 +89,7 @@ class admin_cmd_customfield extends admin_cmd
 		unset($old['modified'], $old['modifier'], $old['tab']);
 		foreach($set as $key => $value)
 		{
-			if(array_key_exists($key, $old) && $old[$key] == $value)
+			if(is_array($old) && array_key_exists($key, $old) && $old[$key] == $value)
 			{
 				// Need to keep these 2 in set so we can tell if it was deleted
 				if(!in_array($key, array('id','name')))
diff --git a/api/src/Etemplate/Widget/Customfields.php b/api/src/Etemplate/Widget/Customfields.php
index 8311fd6bab..e2a89778b7 100644
--- a/api/src/Etemplate/Widget/Customfields.php
+++ b/api/src/Etemplate/Widget/Customfields.php
@@ -332,7 +332,7 @@ class Customfields extends Transformer
 				);
 				foreach($defaults as $f => $d_value)
 				{
-					$widget->attrs[$f] = array_key_exists($f, $field['values']) ? $field['values'][$f] : $d_value;
+					$widget->attrs[$f] = is_array($field['values']) && array_key_exists($f, $field['values']) ? $field['values'][$f] : $d_value;
 				}
 				break;