diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
index 6754beb621..46a1120b88 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
@@ -102,7 +102,7 @@ public class GenCRC32SectionTask extends Task implements EfiDefine{
                 // command execution fail
                 //
                 log("ERROR = " + Integer.toHexString(revl));
-// LAH Added This Line
+                // LAH Added This Line
                 throw new BuildException("GenCRC32Section failed!");
             }
         } catch (Exception e) {
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
index 78eabf9f8d..d0c4c5b637 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
@@ -87,7 +87,7 @@ public class GenFvImageTask extends Task implements EfiDefine{
             throw new BuildException(e.getMessage());
         } finally {
             if (exitCode != 0) {
-                //throw new BuildException("GenFvImage: failed to generate FV file!");
+                throw new BuildException("GenFvImage: failed to generate FV file!");
             }
         }