diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index a6af87f300..5b6620b50d 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -1649,11 +1649,12 @@ public class AutoGen {
                     fileBuffer.append(libInstanceList.get(i)[0]);
                     fileBuffer.append("();\r\n");
                     fileBuffer.append("  VOID\r\n");
+				} else {
+					fileBuffer.append("  Status = ");
+					fileBuffer.append(libInstanceList.get(i)[0]);
+					fileBuffer.append("(ImageHandle, SystemTable);\r\n");
+					fileBuffer.append("  ASSERT_EFI_ERROR (Status);\r\n");
 				}
-                fileBuffer.append("  Status = ");
-                fileBuffer.append(libInstanceList.get(i)[0]);
-                fileBuffer.append("(ImageHandle, SystemTable);\r\n");
-                fileBuffer.append("  ASSERT_EFI_ERROR (Status);\r\n");
             }
             fileBuffer.append("}\r\n");
             break;