diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index ea5e46096..6f176ea9d 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -705,11 +705,20 @@ const Token *SymbolDatabase::initBaseInfo(SpaceInfo *info, const Token *tok)
             }
 
             base.name += tok2->str();
-
             base.spaceInfo = 0;
 
+            // don't add unhandled templates
+            if (tok2->next()->str() == "<")
+            {
+                while (tok2->str() != ">")
+                    tok2 = tok2->next();
+            }
+
             // save pattern for base class name
-            info->derivedFrom.push_back(base);
+            else
+            {
+                info->derivedFrom.push_back(base);
+            }
         }
         tok2 = tok2->next();
     }
diff --git a/test/testclass.cpp b/test/testclass.cpp
index 7ebb646bb..e60e51c67 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -171,6 +171,7 @@ private:
         TEST_CASE(symboldatabase4);
         TEST_CASE(symboldatabase5); // ticket #2178
         TEST_CASE(symboldatabase6); // ticket #2221
+        TEST_CASE(symboldatabase7); // ticket #2230
     }
 
     // Check the operator Equal
@@ -4860,6 +4861,23 @@ private:
                    "Y<X<(6>>1)>> x5;\n");
         ASSERT_EQUALS("", errout.str());
     }
+
+    void symboldatabase7()
+    {
+        // ticket #2230 - segmentation fault
+        checkConst("template<template<class> class E,class D> class C : E<D>\n"
+                   "{\n"
+                   "public:\n"
+                   "	int f();\n"
+                   "};\n"
+                   "class E : C<D,int>\n"
+                   "{\n"
+                   "public:\n"
+                   "	int f() { return C< ::D,int>::f(); }\n"
+                   "};\n");
+
+        ASSERT_EQUALS("", errout.str());
+    }
 };
 
 REGISTER_TEST(TestClass)