Index: shellenv/exec.c
===================================================================
--- shellenv/exec.c	(revision 36)
+++ shellenv/exec.c	(working copy)
@@ -2079,6 +2079,10 @@
         if (!EFI_ERROR (Status)) {
           goto Done;
         } else {
+          //
+          // Set ImageHandle to NULL if any error status is returned.
+          //
+          ImageHandle = NULL;
           Status = LibGetImageHeader (
                      DevicePath,
                      &DosHeader,