diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 6d2d5d1f8c..10bb88b0a8 100644
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -2854,17 +2854,18 @@ Returns:
     fclose (fpin);
     
     if (FvInfoPtr->IsPiFvImage) {
-	    //
-	    // Check whether this ffs file is vtf file
-	    //
-	    if (IsVtfFile (&FfsHeader)) {
-	      if (VtfFileFlag) {
-	        //
-	        // One Fv image can't have two vtf files.
-	        //
-	        return EFI_ABORTED;
-	      }
-	      VtfFileFlag = TRUE;
+        //
+        // Check whether this ffs file is vtf file
+        //
+        if (IsVtfFile (&FfsHeader)) {
+          if (VtfFileFlag) {
+            //
+            // One Fv image can't have two vtf files.
+            //
+            Error (NULL, 0, 3000,"Invalid", "One Fv image can't have two vtf files.");
+            return EFI_ABORTED;
+          }
+          VtfFileFlag = TRUE;
         VtfFileSize = FfsFileSize;
         continue;
       }
diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 163ccd37f1..df97ccbab6 100644
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -181,30 +181,33 @@ class FV (FvClassObject):
         #
         # Write the Fv contents to Buffer
         #
-        FvFileObj = open ( FvOutputFile,'r+b')
+        if os.path.isfile(FvOutputFile):
+            FvFileObj = open ( FvOutputFile,'r+b')
 
-        GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s FV Successfully" %self.UiFvName)
-        GenFdsGlobalVariable.SharpCounter = 0
+            GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s FV Successfully" %self.UiFvName)
+            GenFdsGlobalVariable.SharpCounter = 0
 
-        Buffer.write(FvFileObj.read())
-        FvFileObj.seek(0)
-        # PI FvHeader is 0x48 byte
-        FvHeaderBuffer = FvFileObj.read(0x48)
-        # FV alignment position.
-        FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)
-        # FvAlignmentValue is larger than or equal to 1K
-        if FvAlignmentValue >= 0x400:
-            if FvAlignmentValue >= 0x10000:
-                #The max alignment supported by FFS is 64K.
-                self.FvAlignment = "64K"
+            Buffer.write(FvFileObj.read())
+            FvFileObj.seek(0)
+            # PI FvHeader is 0x48 byte
+            FvHeaderBuffer = FvFileObj.read(0x48)
+            # FV alignment position.
+            FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)
+            # FvAlignmentValue is larger than or equal to 1K
+            if FvAlignmentValue >= 0x400:
+                if FvAlignmentValue >= 0x10000:
+                    #The max alignment supported by FFS is 64K.
+                    self.FvAlignment = "64K"
+                else:
+                    self.FvAlignment = str (FvAlignmentValue / 0x400) + "K"
             else:
-                self.FvAlignment = str (FvAlignmentValue / 0x400) + "K"
+                # FvAlignmentValue is less than 1K
+                self.FvAlignment = str (FvAlignmentValue)
+            FvFileObj.close()
+            GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile
+            GenFdsGlobalVariable.LargeFileInFvFlags.pop()
         else:
-            # FvAlignmentValue is less than 1K
-            self.FvAlignment = str (FvAlignmentValue)
-        FvFileObj.close()
-        GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile
-        GenFdsGlobalVariable.LargeFileInFvFlags.pop()
+            GenFdsGlobalVariable.ErrorLogger("Failed to generate %s FV file." %self.UiFvName)
         return FvOutputFile
 
     ## _GetBlockSize()