diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 1d5b7436405..7e9b80454ef 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -9427,7 +9427,7 @@ void Tokenizer::simplifyFunctionTryCatch()
         if (!Token::Match(tok, "try {|:"))
             continue;
         const Token* par = tok->previous();
-        while (par && par->isKeyword())
+        while (par && !Token::Match(par, "[);]"))
             par = par->previous();
         if (!TokenList::isFunctionHead(par, "try")) // TODO: this is supposed to a list of characters and not strings
             continue;
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 26b24d649c8..ee10b8b4887 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -2379,7 +2379,7 @@ const Token * TokenList::isFunctionHead(const Token *tok, const std::string &suf
             tok = tok->linkAt(1)->next();
         if (Token::Match(tok, "%name% (") && tok->isUpperCaseName())
             tok = tok->linkAt(1)->next();
-        if (tok && tok->originalName() == "->") { // trailing return type
+        if (tok && (tok->str() == "->" || tok->originalName() == "->")) { // trailing return type
             for (tok = tok->next(); tok && !Token::Match(tok, ";|{|override|final|}|)|]"); tok = tok->next())
                 if (tok->link() && Token::Match(tok, "<|[|("))
                     tok = tok->link();
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 75a94c26aec..cb5812e05b0 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -2028,6 +2028,22 @@ class TestTokenizer : public TestFixture {
                                            "void S::func() const\n"
                                            "try { f(); }\n"
                                            "catch (...) { g(); }\n"));
+
+        ASSERT_EQUALS("struct D : B {\n" // #15126
+                      "void f ( ) override { try { } catch ( ... ) { } }\n"
+                      "void g ( ) final { try { } catch ( ... ) { } }\n"
+                      "void i ( ) & override { try { } catch ( ... ) { } }\n"
+                      "void j ( ) const && override { try { } catch ( ... ) { } }\n"
+                      "auto k ( ) . std :: nullptr_t override { try { } catch ( ... ) { } }\n"
+                      "} ;",
+                      tokenizeAndStringify("struct D : B {\n"
+                                           "    void f() override try {} catch (...) {}\n"
+                                           "    void g() final try {} catch (...) {}\n"
+                                           "    void i() & override try {} catch (...) {}\n"
+                                           "    void j() const && override try {} catch (...) {}\n"
+                                           "    auto k() -> std::nullptr_t override try {} catch (...) {}\n"
+                                           "};\n"));
+        ASSERT_EQUALS("[test.cpp:6:5]: (debug) auto token with no type. [autoNoType]\n", errout_str());
     }
 
     // Simplify "((..))" into "(..)"