diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb
index 0ee5e83..2baaf0d 100644
--- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb
+++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb
@@ -8,8 +8,6 @@
 
 RDEPENDS_${PN} += "phosphor-power"
 
-OBMC_POWER_SUPPLY_INSTANCES ?= "0"
-
 ALLOW_EMPTY_${PN} = "1"
 
 pkg_postinst_${PN}() {
@@ -24,7 +22,9 @@
 	TARGET="../pseq-monitor-pgood.service"
 	ln -s $TARGET $LINK
 
-	for inst in $OBMC_POWER_SUPPLY_INSTANCES; do
+	[ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1
+
+	for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do
 		LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service"
 		TARGET="../power-supply-monitor@.service"
 		ln -s $TARGET $LINK
@@ -36,7 +36,10 @@
 	rm $LINK
 	LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service"
 	rm $LINK
-	for inst in $OBMC_POWER_SUPPLY_INSTANCES; do
+
+	[ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1
+
+	for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do
 		LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service"
 		rm $LINK
 	done