diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c
index f52709dfce..dd5cc44845 100644
--- a/src/soc/intel/common/block/cpu/mp_init.c
+++ b/src/soc/intel/common/block/cpu/mp_init.c
@@ -134,7 +134,8 @@ static void init_cpus(void *unused)
 	microcode_patch = intel_microcode_find();
 	intel_microcode_load_unlocked(microcode_patch);
 
-	soc_init_cpus(dev->link_list);
+	if (dev && dev->link_list)
+		soc_init_cpus(dev->link_list);
 }
 
 static void wrapper_x86_setup_mtrrs(void *unused)
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index c6ea7e2dca..74a5cae4bb 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -15,6 +15,7 @@
  */
 
 #include <compiler.h>
+#include <assert.h>
 #include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
@@ -36,9 +37,10 @@ static uintptr_t graphics_get_bar(unsigned long index)
 {
 	struct device *dev = SA_DEV_IGD;
 	struct resource *gm_res;
+	assert(dev != NULL);
 
 	/* Check if Graphics PCI device is disabled */
-	if (!dev->enabled)
+	if (!dev || !dev->enabled)
 		return 0;
 
 	gm_res = find_resource(dev, index);