diff --git a/layouts/v7/modules/Settings/PickListDependency/DependencyGraph.tpl b/layouts/v7/modules/Settings/PickListDependency/DependencyGraph.tpl
index fe456c44af791845dd15a642cee4f77ddf136533..d47e8bae53e9e2c26e088e53bdfd9e6a3fddfcbd 100644
--- a/layouts/v7/modules/Settings/PickListDependency/DependencyGraph.tpl
+++ b/layouts/v7/modules/Settings/PickListDependency/DependencyGraph.tpl
@@ -87,7 +87,7 @@
                     {foreach key=TARGET_VALUE item=TRANSLATED_TARGET_VALUE from=$TARGET_PICKLIST_VALUES}
                         <tr>
                             {foreach key=SOURCE_PICKLIST_VALUE item=TRANSLATED_SOURCE_PICKLIST_VALUE from=$SOURCE_PICKLIST_VALUES}
-                                {assign var=targetValues value=(isset($MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]])) ? $MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]] : ''}
+                                {assign var=targetValues value=(isset($MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]])) ? $MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]] : []}
                                 {assign var=IS_SELECTED value=false}
                                 {if empty($targetValues) || in_array($TARGET_VALUE, $targetValues)}
                                     {assign var=IS_SELECTED value=true}
diff --git a/modules/PickList/DependentPickListUtils.php b/modules/PickList/DependentPickListUtils.php
index 4a8fbf6191b05132194ab6df47836d9a76f4b229..75e68eb93651baa233e407fe2d5496b737394447 100644
--- a/modules/PickList/DependentPickListUtils.php
+++ b/modules/PickList/DependentPickListUtils.php
@@ -170,7 +170,7 @@ class Vtiger_DependencyPicklist {
 			$targetValues = decode_html($adb->query_result($result, $i, 'targetvalues'));
 			$unserializedTargetValues = Zend_Json::decode(html_entity_decode($targetValues));
 			$criteria = decode_html($adb->query_result($result, $i, 'criteria'));
-			$unserializedCriteria = isset($criteria) ? Zend_Json::decode(html_entity_decode($criteria)) : '';
+			$unserializedCriteria = isset($criteria) ? Zend_Json::decode(html_entity_decode($criteria)) : array();
 
 			if(!empty($unserializedCriteria) && $unserializedCriteria['fieldname'] != null) {
 				$conditionValue = array(