diff --git a/dockers/docker-iccpd/iccpd.j2 b/dockers/docker-iccpd/iccpd.j2
index 6c6f9fab1afa..fa7543422cca 100644
--- a/dockers/docker-iccpd/iccpd.j2
+++ b/dockers/docker-iccpd/iccpd.j2
@@ -2,7 +2,7 @@
 mclag_id:{{mclag_id}}
     local_ip:{{MC_LAG[mclag_id]['local_ip']}}
     peer_ip:{{MC_LAG[mclag_id]['peer_ip']}}
-{% if MC_LAG[mclag_id].has_key('peer_link') %}
+{% if 'peer_link' in MC_LAG[mclag_id] %}
     peer_link:{{MC_LAG[mclag_id]['peer_link']}}
 {% endif %}
     mclag_interface:{{MC_LAG[mclag_id]['mclag_interface']}}
diff --git a/dockers/docker-iccpd/start.sh b/dockers/docker-iccpd/start.sh
index f2e9807f314f..bba5e490c466 100644
--- a/dockers/docker-iccpd/start.sh
+++ b/dockers/docker-iccpd/start.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-
+set -e
 
 ICCPD_CONF_PATH=/etc/iccpd