diff --git a/src/soc/intel/cannonlake/memmap.c b/src/soc/intel/cannonlake/memmap.c
index 8f842c0c5c..29f25f2693 100644
--- a/src/soc/intel/cannonlake/memmap.c
+++ b/src/soc/intel/cannonlake/memmap.c
@@ -91,6 +91,8 @@ static uintptr_t calculate_dram_base(void)
 	size_t imr_size;
 
 	dev = dev_find_slot(0, PCI_DEVFN(SA_DEV_SLOT_IGD, 0));
+	if (!dev)
+		die("ERROR - device not found!");
 
 	/* Read TOLUD from Host Bridge offset */
 	dram_base = sa_get_tolud_base();
diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c
index 229afa7b43..6c640732cc 100644
--- a/src/soc/intel/skylake/memmap.c
+++ b/src/soc/intel/skylake/memmap.c
@@ -142,6 +142,8 @@ static u32 calculate_dram_base(void)
 	size_t prmrr_size;
 
 	dev = dev_find_slot(0, PCI_DEVFN(SA_DEV_SLOT_IGD, 0));
+	if (!dev)
+		die("ERROR - device not found!");
 
 	/* Read TOLUD from Host Bridge offset */
 	dram_base = sa_get_tolud_base();
@@ -160,7 +162,6 @@ static u32 calculate_dram_base(void)
 	if (IS_ENABLED(CONFIG_SA_ENABLE_DPR))
 		dram_base -= sa_get_dpr_size();
 
-	dev = dev_find_slot(0, PCI_DEVFN(SA_DEV_SLOT_ROOT, 0));
 	config = dev->chip_info;
 	if (IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1))
 		prmrr_size = 1*MiB;