diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar
index 15d453b2..f4d8765d 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java
index 305f5ea4..187a645c 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java	
@@ -1739,6 +1739,11 @@ public class Presenter implements IPlugInPort {
 			Template template) {
 		LOG.info(String.format("setNewComponentSlot(%s)",
 				componentType == null ? null : componentType.getName()));
+		if (componentType != null && componentType.getInstanceClass() == null) {
+			LOG.info("Cannot set new component type slot for type " + componentType.getName());
+			setNewComponentTypeSlot(null, null);
+			return;
+		}
 		try {
 			instantiationManager.setComponentTypeSlot(componentType, template,
 					currentProject);