diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index c01baed55..a43c39ea5 100644
--- a/lib/checkclass.cpp
+++ b/lib/checkclass.cpp
@@ -695,6 +695,14 @@ void CheckClass::unusedPrivateFunctionError(const Token *tok, const std::string
 
 void CheckClass::checkMemsetType(const Token *tok, const std::string &type)
 {
+    // check for cached message for this type
+    std::map<std::string, std::string>::const_iterator msg = _memsetClassMessages.find(type);
+    if (msg != _memsetClassMessages.end())
+    {
+        memsetError(tok, type, msg->second);
+        return;
+    }
+
     // Warn if type is a class or struct that contains any std::* variables
     const std::string pattern2(std::string("struct|class ") + type + " :|{");
     const Token *tstruct = Token::findmatch(_tokenizer->tokens(), pattern2.c_str());
@@ -702,7 +710,8 @@ void CheckClass::checkMemsetType(const Token *tok, const std::string &type)
     if (!tstruct)
         return;
 
-    const std::string &typeName = tstruct->str();
+    // typeKind is either 'struct' or 'class'
+    const std::string &typeKind = tstruct->str();
 
     if (tstruct->tokAt(2)->str() == ":")
     {
@@ -743,7 +752,7 @@ void CheckClass::checkMemsetType(const Token *tok, const std::string &type)
             tstruct->str().find(":") != std::string::npos)
         {
             if (Token::Match(tstruct->next(), "std :: %type% %var% ;"))
-                memsetError(tok, tok->str(), "'std::" + tstruct->strAt(3) + "'", typeName);
+                memsetError(tok, type, tok->str(), "'std::" + tstruct->strAt(3) + "'", typeKind);
 
             else if (Token::Match(tstruct->next(), "std :: %type% <"))
             {
@@ -771,10 +780,12 @@ void CheckClass::checkMemsetType(const Token *tok, const std::string &type)
 
                 // found error => report
                 if (Token::Match(tstruct, "> %var% ;"))
-                    memsetError(tok, tok->str(), "'std::" + typestr + "'", typeName);
+                    memsetError(tok, type, tok->str(), "'std::" + typestr + "'", typeKind);
             }
             else if (Token::simpleMatch(tstruct->next(), "virtual"))
-                memsetError(tok, tok->str(), "virtual method", typeName);
+                memsetError(tok, type, tok->str(), "virtual method", typeKind);
+            else if (!Token::Match(tstruct->next(), "static|}"))
+                checkMemsetType(tok, tstruct->next()->str());
         }
     }
 }
@@ -816,9 +827,16 @@ void CheckClass::noMemset()
     }
 }
 
-void CheckClass::memsetError(const Token *tok, const std::string &memfunc, const std::string &classname, const std::string &type)
+void CheckClass::memsetError(const Token *tok, const std::string &type, const std::string &message)
 {
-    reportError(tok, Severity::error, "memsetClass", "Using '" + memfunc + "' on " + type + " that contains a " + classname);
+    reportError(tok, Severity::error, "memsetClass", message);
+    // cache the message for this type so we don't have to look it up again
+    _memsetClassMessages[type] = message;
+}
+
+void CheckClass::memsetError(const Token *tok, const std::string &type, const std::string &memfunc, const std::string &classname, const std::string &typekind)
+{
+    memsetError(tok, type, "Using '" + memfunc + "' on " + typekind + " that contains a " + classname);
 }
 
 //---------------------------------------------------------------------------
diff --git a/lib/checkclass.h b/lib/checkclass.h
index 1b3b5fa43..9cd12f499 100644
--- a/lib/checkclass.h
+++ b/lib/checkclass.h
@@ -84,7 +84,6 @@ public:
      * Important: The checking doesn't work on simplified tokens list.
      */
     void noMemset();
-    void checkMemsetType(const Token *tok, const std::string &type);
 
     /** @brief 'operator=' should return something and it should not be const. */
     void operatorEq();
@@ -118,7 +117,8 @@ private:
     void uninitVarError(const Token *tok, const std::string &classname, const std::string &varname);
     void operatorEqVarError(const Token *tok, const std::string &classname, const std::string &varname);
     void unusedPrivateFunctionError(const Token *tok, const std::string &classname, const std::string &funcname);
-    void memsetError(const Token *tok, const std::string &memfunc, const std::string &classname, const std::string &type);
+    void memsetError(const Token *tok, const std::string &type, const std::string &message);
+    void memsetError(const Token *tok, const std::string &type, const std::string &memfunc, const std::string &classname, const std::string &typekind);
     void operatorEqReturnError(const Token *tok);
     void virtualDestructorError(const Token *tok, const std::string &Base, const std::string &Derived);
     void thisSubtractionError(const Token *tok);
@@ -134,7 +134,7 @@ private:
         c.uninitVarError(0, "classname", "varname");
         c.operatorEqVarError(0, "classname", "");
         c.unusedPrivateFunctionError(0, "classname", "funcname");
-        c.memsetError(0, "memfunc", "classname", "class");
+        c.memsetError(0, "type", "memfunc", "classname", "class");
         c.operatorEqReturnError(0);
         //c.virtualDestructorError(0, "Base", "Derived");
         c.thisSubtractionError(0);
@@ -228,6 +228,10 @@ private:
     void initializeVarList(const Function &func, std::list<std::string> &callstack, const Scope *scope, std::vector<Usage> &usage);
 
     bool canNotCopy(const Scope *scope) const;
+
+    // noMemset helpers
+    void checkMemsetType(const Token *tok, const std::string &type);
+    std::map<std::string, std::string> _memsetClassMessages;
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/test/testclass.cpp b/test/testclass.cpp
index ff0da1953..afa2748a2 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -2962,6 +2962,18 @@ private:
                       "}\n");
         ASSERT_EQUALS("[test.cpp:9]: (error) Using 'memset' on class that contains a 'std::string'\n", errout.str());
 
+        checkNoMemset("struct Stringy {\n"
+                      "    std::string inner;\n"
+                      "};\n"
+                      "struct Foo {\n"
+                      "    Stringy s;\n"
+                      "};\n"
+                      "int main() {\n"
+                      "    Foo foo;\n"
+                      "    memset(&foo, 0, sizeof(Foo));\n"
+                      "}\n");
+        ASSERT_EQUALS("[test.cpp:9]: (error) Using 'memset' on struct that contains a 'std::string'\n", errout.str());
+
         checkNoMemset("class Fred\n"
                       "{\n"
                       "    virtual ~Fred();\n"