diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.c b/ShellPkg/Application/Shell/FileHandleWrappers.c
index ef8293c1de..c67ddfc269 100644
--- a/ShellPkg/Application/Shell/FileHandleWrappers.c
+++ b/ShellPkg/Application/Shell/FileHandleWrappers.c
@@ -2,7 +2,7 @@
   EFI_FILE_PROTOCOL wrappers for other items (Like Environment Variables,
   StdIn, StdOut, StdErr, etc...).
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2013, Hewlett-Packard Development Company, L.P.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -973,7 +973,7 @@ FileInterfaceEnvClose(
     Status = SHELL_GET_ENVIRONMENT_VARIABLE(((EFI_FILE_PROTOCOL_ENVIRONMENT*)This)->Name, &NewSize, NewBuffer);
   }
   
-  if (!EFI_ERROR(Status)) {
+  if (!EFI_ERROR(Status) && NewBuffer != NULL) {
     
     if (StrSize(NewBuffer) > 6)
     {
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index afeedb0959..b02048302e 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -121,11 +121,15 @@ CascadeProcessVariables (
   if (Status == EFI_BUFFER_TOO_SMALL) {
     SHELL_FREE_NON_NULL(FoundVarName);
     FoundVarName = AllocateZeroPool (NameSize);
-    if (PrevName != NULL) {
-      StrCpy(FoundVarName, PrevName);
-    }
+    if (FoundVarName != NULL) {
+      if (PrevName != NULL) {
+        StrCpy(FoundVarName, PrevName);
+      }
 
-    Status = gRT->GetNextVariableName (&NameSize, FoundVarName, &FoundVarGuid);
+      Status = gRT->GetNextVariableName (&NameSize, FoundVarName, &FoundVarGuid);
+    } else {
+      Status = EFI_OUT_OF_RESOURCES;
+    }
   }
 
   //