diff --git a/lib/AST/Comment.cpp b/lib/AST/Comment.cpp
index f3f4d9b..82dbed4 100644
--- a/lib/AST/Comment.cpp
+++ b/lib/AST/Comment.cpp
@@ -116,7 +116,8 @@
     if (const TextComment *TC = dyn_cast<TextComment>(*I)) {
       if (!TC->isWhitespace())
         return false;
-    }
+    } else
+      return false;
   }
   return true;
 }
diff --git a/test/Sema/warn-documentation.cpp b/test/Sema/warn-documentation.cpp
index f128718..aec914a 100644
--- a/test/Sema/warn-documentation.cpp
+++ b/test/Sema/warn-documentation.cpp
@@ -104,6 +104,9 @@
 /// \brief Aaa
 int test_block_command5(int);
 
+/// \brief \c Aaa
+int test_block_command6(int);
+
 // expected-warning@+1 {{'\param' command used in a comment that is not attached to a function declaration}}
 /// \param a Blah blah.
 int test_param1;