diff --git a/checkstyle/plugin.jelly b/checkstyle/plugin.jelly
index 21cbfb1c..7b53e7e0 100644
--- a/checkstyle/plugin.jelly
+++ b/checkstyle/plugin.jelly
@@ -76,14 +76,9 @@
 
     <j:if test="${sourcesPresent == 'true'}">
 
-      <j:catch var="exception">
-        <attainGoal name="checkstyle:run"/>
-      </j:catch>
-
-      <j:if test="${(exception != null)}">
-        <j:choose>
-          <j:when test="${exception.indexOf('unable to load header file') != '-1'}">
-            <ant:echo>
+      <util:file var="headerFile" name="${maven.checkstyle.header.file}"/>
+      <j:if test="${!headerFile.exists()}">
+        <ant:echo>
       =================================================================
       =                          W A R N I N G                        =
       =================================================================
@@ -95,14 +90,10 @@
       =  A temporary solution is to create an empty LICENSE.txt file. =
       =  Though, we recommend that you edit this License.             =
       =================================================================
-            </ant:echo>
-          </j:when>
-          <j:otherwise>
-            <ant:fail message="${exception}"/>
-          </j:otherwise>
-        </j:choose>
+        </ant:echo>
       </j:if>
 
+      <attainGoal name="checkstyle:run"/>
     </j:if>
     
   </goal>