diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee
index 49560043c..0b2face26 100644
--- a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee
+++ b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee
@@ -164,7 +164,8 @@ class FuzzyFinderView extends SelectList
   getOpenedPaths: ->
     paths = {}
     for editSession in rootView.project.getEditSessions()
-      paths[editSession.getPath()] = editSession.lastOpened
+      path = editSession.getPath()
+      paths[path] = editSession.lastOpened if path?
     paths
 
   detach: ->
diff --git a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
index 8cc3086a6..ef99f9bae 100644
--- a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
+++ b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
@@ -151,6 +151,7 @@ describe 'FuzzyFinder', ->
           rootView.trigger 'fuzzy-finder:toggle-buffer-finder'
           rootView.open 'sample.js'
           rootView.trigger 'fuzzy-finder:toggle-buffer-finder'
+          rootView.open()
 
           states = rootView.serialize().packageStates
           states = _.map states['fuzzy-finder'], (path, time) -> [ path, time ]