diff --git a/src/main/java/games/rednblack/editor/factory/ItemFactory.java b/src/main/java/games/rednblack/editor/factory/ItemFactory.java
index bf3060d8..a89839ae 100644
--- a/src/main/java/games/rednblack/editor/factory/ItemFactory.java
+++ b/src/main/java/games/rednblack/editor/factory/ItemFactory.java
@@ -50,7 +50,7 @@ public class ItemFactory implements IFactory {
         UILayerBoxMediator layerBoxMediator = Facade.getInstance().retrieveMediator(UILayerBoxMediator.NAME);
         String layerName = layerBoxMediator.getCurrentSelectedLayerName();
 
-        if(layerName == null) return false;
+        if(layerName == null) layerName = "Default";
 
         vo.layerName = layerName;
 
diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UILayerBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UILayerBox.java
index 9840f25e..4673e427 100644
--- a/src/main/java/games/rednblack/editor/view/ui/box/UILayerBox.java
+++ b/src/main/java/games/rednblack/editor/view/ui/box/UILayerBox.java
@@ -247,8 +247,7 @@ public class UILayerBox extends UICollapsibleBox {
                     uiLayerBox.currentSelectedLayerIndex = uiLayerBox.rows.size - uiLayerBox.rows.indexOf(uiLayerItemSlotTarget, true) - 1;
                 }
 
-                // Send notification with the two layers to swap.
-                // TODO - change from swap to repositioning source above target.
+                // Send notification with the two layers to jump.
                 String[] notificationPayload = {sourceLayer, targetLayer};
                 Facade.getInstance().sendNotification(LAYER_DROPPED, notificationPayload);
             }