diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index cc045648c..708c7c870 100644
--- a/googlemock/include/gmock/gmock-matchers.h
+++ b/googlemock/include/gmock/gmock-matchers.h
@@ -4812,7 +4812,8 @@ class ExceptionMatcherImpl {
 //
 //   EXPECT_THAT(
 //       []() { throw std::runtime_error("message"); },
-//       Throws
+//       Throws<std::runtime_error>(
+//           Property(&std::runtime_error::what, HasSubstr("message"))));
 
 template <typename Err>
 PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>>
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index dd61a5391..074118738 100644
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@ -8119,6 +8119,26 @@ TEST(MatcherPMacroTest, WorksOnMoveOnlyType) {
 
 #if GTEST_HAS_EXCEPTIONS
 
+// Test that examples from documentation compile
+TEST(ThrowsTest, Examples) {
+  EXPECT_THAT(
+      []() { throw std::runtime_error("message"); },
+      Throws<std::runtime_error>());
+
+  EXPECT_THAT(
+      []() { throw std::runtime_error("message"); },
+      ThrowsMessage<std::runtime_error>(HasSubstr("message")));
+
+  EXPECT_THAT(
+      []() { throw std::runtime_error("message"); },
+      ThrowsMessageHasSubstr<std::runtime_error>("message"));
+
+  EXPECT_THAT(
+      []() { throw std::runtime_error("message"); },
+      Throws<std::runtime_error>(
+          Property(&std::runtime_error::what, HasSubstr("message"))));
+}
+
 TEST(ThrowsTest, Describe) {
   Matcher<void (*)()> matcher = Throws<std::runtime_error>();
   std::stringstream ss;