diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
index 3a1a0a1cb2..90f1a02d9a 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
@@ -792,6 +792,10 @@ UefiMain (
     return EFI_INVALID_PARAMETER;
   }
   if (StrCmp(Argv[1], L"-D") == 0) {
+    if (Argc < 3) {
+      Print(L"CapsuleApp: NO input capsule name.\n");
+      return EFI_INVALID_PARAMETER;
+    }
     Status = DumpCapsule(Argv[2]);
     return Status;
   }