diff --git a/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
index 10fd332fe5..8449997050 100644
--- a/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
+++ b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
@@ -45,11 +45,17 @@ PlatformHookSerialPortInitialize (
   }
 
   if (SerialRegAccessType == 2) { //MMIO
-    PcdSetBoolS (PcdSerialUseMmio, TRUE);
+    Status = PcdSetBoolS (PcdSerialUseMmio, TRUE);
   } else { //IO
-    PcdSetBoolS (PcdSerialUseMmio, FALSE);
+    Status = PcdSetBoolS (PcdSerialUseMmio, FALSE);
+  }
+  if (RETURN_ERROR (Status)) {
+    return Status;
+  }
+  Status = PcdSet64S (PcdSerialRegisterBase, (UINT64) SerialRegBase);
+  if (RETURN_ERROR (Status)) {
+    return Status;
   }
-  PcdSet64S (PcdSerialRegisterBase, (UINT64) SerialRegBase);
 
   return RETURN_SUCCESS;
 }