diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index 16ffec09bd..2e43b415ec 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -656,10 +656,9 @@ IScsiDhcpIsConfigured (
              (VOID**)&ConfigDataTmp,
              NULL
              );
-  if (EFI_ERROR (Status)) {
+  if (ConfigDataTmp == NULL || EFI_ERROR (Status)) {
     return FALSE;
   }
-  
 
   if (ConfigDataTmp->Enabled && ConfigDataTmp->InitiatorInfoFromDhcp) {
     FreePool (ConfigDataTmp);