diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java
index ac6d4058964..99d99e82e3f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java
@@ -214,7 +214,7 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer {
 			fPos--;
 			IType type = unmarshalType();
 			IType originalType = unmarshalType();
-			if (originalType == null)
+			if (originalType == null || originalType == UNSTORABLE_TYPE_PROBLEM)
 				originalType= type;
 			return new CPPTemplateTypeArgument(type, originalType);
 		}