diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c
index a7031dfc4e..51ce16911b 100644
--- a/NetworkPkg/IScsiDxe/IScsiDriver.c
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.c
@@ -105,7 +105,8 @@ IScsiCheckAip (
   //
   // Check any AIP instances exist in system.
   //
-  AipHandleCount = 0;
+  AipHandleCount  = 0;
+  AipHandleBuffer = NULL;
   Status = gBS->LocateHandleBuffer (
                   ByProtocol,
                   &gEfiAdapterInformationProtocolGuid,
@@ -117,6 +118,8 @@ IScsiCheckAip (
     return EFI_NOT_FOUND;
   }
 
+  ASSERT (AipHandleBuffer != NULL);
+
   InfoBlock = NULL;
 
   for (AipIndex = 0; AipIndex < AipHandleCount; AipIndex++) {