diff --git a/Tools/Java/Source/CheckTools/src/org/tianocore/CheckTools/CheckTools.java b/Tools/Java/Source/CheckTools/src/org/tianocore/CheckTools/CheckTools.java
index 579c5f50d6..a7b55279d2 100644
--- a/Tools/Java/Source/CheckTools/src/org/tianocore/CheckTools/CheckTools.java
+++ b/Tools/Java/Source/CheckTools/src/org/tianocore/CheckTools/CheckTools.java
@@ -86,7 +86,7 @@ public class CheckTools {
 
         if (WORKSPACE == null) {
             System.out.println("Please set the environment variable, WORKSPACE and run again.");
-            System.exit(1);
+            System.exit(FAIL);
         }
         String targetTxt = WORKSPACE + SEP + "Tools" + SEP + "Conf" + SEP + "target.txt";
 
diff --git a/Tools/Java/Source/CheckTools/src/org/tianocore/CheckTools/ToolChecks.java b/Tools/Java/Source/CheckTools/src/org/tianocore/CheckTools/ToolChecks.java
index ad4c544ff8..5dbd5c54df 100644
--- a/Tools/Java/Source/CheckTools/src/org/tianocore/CheckTools/ToolChecks.java
+++ b/Tools/Java/Source/CheckTools/src/org/tianocore/CheckTools/ToolChecks.java
@@ -93,6 +93,9 @@ public class ToolChecks {
                 System.out.println("and commenting out out or deleting the entries for the tool");
                 System.out.println("chain tag names that do not apply to your system.");
             }
+        } else {
+            System.out.println("");
+            System.out.println("  Tool Configuration File: " + toolConfFile + " is valid!");
         }
 
         return returnCode;
@@ -147,7 +150,7 @@ public class ToolChecks {
             }
         } catch (IOException e) {
             System.out.println(" [" + testFile + "] " + e);
-            System.exit(1);
+            System.exit(FAIL);
         }
         if (errLog.size() > 0)
             for (int i = 0; i < goodLog.size(); i++) {