diff --git a/spec/pane-spec.coffee b/spec/pane-spec.coffee
index b4785e113..888ccf6e2 100644
--- a/spec/pane-spec.coffee
+++ b/spec/pane-spec.coffee
@@ -337,6 +337,10 @@ describe "Pane", ->
       expect(pane.itemStack).toEqual [item2]
       expect(pane.getActiveItem()).toBe item2
 
+      pane.destroyItem(item2)
+      expect(pane.itemStack).toEqual []
+      expect(pane.getActiveItem()).toBeUndefined()
+
     it "invokes ::onWillDestroyItem() observers before destroying the item", ->
       events = []
       pane.onWillDestroyItem (event) ->
diff --git a/src/pane.coffee b/src/pane.coffee
index 9905680bd..25f421934 100644
--- a/src/pane.coffee
+++ b/src/pane.coffee
@@ -307,6 +307,7 @@ class Pane extends Model
 
   # Add item (or move item) to the end of the itemStack
   addItemToStack: (newItem) ->
+    return unless newItem?
     index = @itemStack.indexOf(newItem)
     @itemStack.splice(index, 1) unless index is -1
     @itemStack.push(newItem)