diff --git a/pom.xml b/pom.xml
index 6ad8232a2..fb29d60ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1082,7 +1082,7 @@
             <regex><pattern>.*.PropertiesExpander</pattern><branchRate>50</branchRate><lineRate>83</lineRate></regex>
             <regex><pattern>.*.PropertyCacheFile</pattern><branchRate>22</branchRate><lineRate>19</lineRate></regex>
             <regex><pattern>.*.checkstyle.ScopeUtils</pattern><branchRate>90</branchRate><lineRate>94</lineRate></regex>
-            <regex><pattern>.*.TreeWalker</pattern><branchRate>92</branchRate><lineRate>91</lineRate></regex>
+            <regex><pattern>.*.TreeWalker</pattern><branchRate>94</branchRate><lineRate>92</lineRate></regex>
             <regex><pattern>com.puppycrawl.tools.checkstyle.Utils</pattern><branchRate>85</branchRate><lineRate>93</lineRate></regex>
             <regex><pattern>.*.XMLLogger</pattern><branchRate>86</branchRate><lineRate>97</lineRate></regex>
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
index 3c59969a0..05a581fbf 100755
--- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
@@ -584,13 +584,11 @@ public final class TreeWalker
      * @return DetailAST of comment node.
      */
     private static DetailAST createCommentAstFromToken(Token token) {
-        switch (token.getType()) {
-            case TokenTypes.SINGLE_LINE_COMMENT:
-                return createSlCommentNode(token);
-            case TokenTypes.BLOCK_COMMENT_BEGIN:
-                return createBlockCommentNode(token);
-            default:
-                throw new IllegalArgumentException("Unknown comment type");
+        if (token.getType() == TokenTypes.SINGLE_LINE_COMMENT) {
+            return createSlCommentNode(token);
+        }
+        else {
+            return createBlockCommentNode(token);
         }
     }