diff --git a/binaries/data/mods/public/gui/session_new/session.js b/binaries/data/mods/public/gui/session_new/session.js
index 530938db50..11d2a281b9 100644
--- a/binaries/data/mods/public/gui/session_new/session.js
+++ b/binaries/data/mods/public/gui/session_new/session.js
@@ -134,6 +134,8 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
 		var icon = getGUIObjectByName("unit"+guiName+"Icon["+i+"]");
 
 		var template = Engine.GuiInterfaceCall("GetTemplateData", entType);
+		if (!template)
+			continue; // ignore attempts to use invalid templates (an error should have been reported already)
 
 		var name;
 		if (template.name.specific && template.name.generic)