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 7a419877..8c5b9cfe 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	
@@ -86,8 +86,8 @@ public class Presenter implements IPlugInPort {
 	private MessageDispatcher<EventType> messageDispatcher;
 
 	// Layers
-//	private Set<ComponentLayer> lockedLayers;
-//	private Set<ComponentLayer> visibleLayers;
+	// private Set<ComponentLayer> lockedLayers;
+	// private Set<ComponentLayer> visibleLayers;
 
 	// D&D
 	private boolean dragInProgress = false;
@@ -109,8 +109,8 @@ public class Presenter implements IPlugInPort {
 		currentProject = new Project();
 		cloner = new Cloner();
 
-//		lockedLayers = EnumSet.noneOf(ComponentLayer.class);
-//		visibleLayers = EnumSet.allOf(ComponentLayer.class);
+		// lockedLayers = EnumSet.noneOf(ComponentLayer.class);
+		// visibleLayers = EnumSet.allOf(ComponentLayer.class);
 	}
 
 	public void installPlugin(IPlugIn plugIn) {
@@ -573,7 +573,7 @@ public class Presenter implements IPlugInPort {
 			selectedComponents.clear();
 			for (IDIYComponent<?> component : currentProject.getComponents()) {
 				Area area = componentAreaMap.get(component);
-				if ((area != null) && area.intersects(selectionRect)) {
+				if ((area != null) && (selectionRect != null) && area.intersects(selectionRect)) {
 					selectedComponents.add(component);
 				}
 			}
@@ -605,31 +605,31 @@ public class Presenter implements IPlugInPort {
 		messageDispatcher.dispatchMessage(EventType.REPAINT);
 	}
 
-//	public boolean isLayerLocked(ComponentLayer layer) {
-//		return lockedLayers.contains(layer);
-//	}
-//
-//	public void setLayerLocked(ComponentLayer layer, boolean locked) {
-//		LOG.debug(String.format("setLayerLocked(%s, %s)", layer, locked));
-//		if (locked) {
-//			lockedLayers.add(layer);
-//		} else {
-//			lockedLayers.remove(layer);
-//		}
-//	}
-//
-//	public boolean isLayerVisible(ComponentLayer layer) {
-//		return visibleLayers.contains(layer);
-//	}
-//
-//	public void setLayerVisible(ComponentLayer layer, boolean visible) {
-//		LOG.debug(String.format("setLayerVisible(%s, %s)", layer, visible));
-//		if (visible) {
-//			visibleLayers.add(layer);
-//		} else {
-//			visibleLayers.remove(layer);
-//		}
-//	}
+	// public boolean isLayerLocked(ComponentLayer layer) {
+	// return lockedLayers.contains(layer);
+	// }
+	//
+	// public void setLayerLocked(ComponentLayer layer, boolean locked) {
+	// LOG.debug(String.format("setLayerLocked(%s, %s)", layer, locked));
+	// if (locked) {
+	// lockedLayers.add(layer);
+	// } else {
+	// lockedLayers.remove(layer);
+	// }
+	// }
+	//
+	// public boolean isLayerVisible(ComponentLayer layer) {
+	// return visibleLayers.contains(layer);
+	// }
+	//
+	// public void setLayerVisible(ComponentLayer layer, boolean visible) {
+	// LOG.debug(String.format("setLayerVisible(%s, %s)", layer, visible));
+	// if (visible) {
+	// visibleLayers.add(layer);
+	// } else {
+	// visibleLayers.remove(layer);
+	// }
+	// }
 
 	@SuppressWarnings("unchecked")
 	@Override