diff --git a/src/apps/debugger/debug_info/DwarfTypeFactory.cpp b/src/apps/debugger/debug_info/DwarfTypeFactory.cpp
index 527e500d0a..ed28f8820c 100644
--- a/src/apps/debugger/debug_info/DwarfTypeFactory.cpp
+++ b/src/apps/debugger/debug_info/DwarfTypeFactory.cpp
@@ -576,8 +576,9 @@ printf("  -> failed to add type to cache\n");
 					= dynamic_cast<DIETemplateTypeParameter*>(_typeEntry);
 				DwarfType* templateType;
 				if (templateTypeEntry != NULL) {
-					if (CreateType(templateTypeEntry->GetType(), templateType)
-						!= B_OK) {
+					if (templateTypeEntry->GetType() == NULL
+						|| CreateType(templateTypeEntry->GetType(),
+							templateType) != B_OK) {
 						continue;
 					}
 				} else {