diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java
index e2eca630..5d0719a6 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java	
@@ -1055,7 +1055,9 @@ public class Presenter implements IPlugInPort {
 				: componentType.getName()));
 		try {
 			instantiationManager.setComponentTypeSlot(componentType, currentProject);
-			updateSelection(ComponentSelection.EMPTY_SELECTION);
+			if (componentType != null) {
+				updateSelection(ComponentSelection.EMPTY_SELECTION);
+			}
 			messageDispatcher.dispatchMessage(EventType.REPAINT);
 			// messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED,
 			// selectedComponents);