diff --git a/internal_packages/message-list/lib/thread-archive-button.cjsx b/internal_packages/message-list/lib/thread-archive-button.cjsx
index 82c35b40b..39f1157c4 100644
--- a/internal_packages/message-list/lib/thread-archive-button.cjsx
+++ b/internal_packages/message-list/lib/thread-archive-button.cjsx
@@ -13,7 +13,7 @@ class ThreadArchiveButton extends React.Component
     thread: React.PropTypes.object.isRequired
 
   render: =>
-    return false unless FocusedPerspectiveStore.current()?.canArchiveThreads()
+    return false unless FocusedPerspectiveStore.current().canArchiveThreads()
 
     <button className="btn btn-toolbar btn-archive"
             style={order: -107}
diff --git a/internal_packages/search-bar/lib/search-suggestion-store.coffee b/internal_packages/search-bar/lib/search-suggestion-store.coffee
index a666d5cb0..bce7e2f58 100644
--- a/internal_packages/search-bar/lib/search-suggestion-store.coffee
+++ b/internal_packages/search-bar/lib/search-suggestion-store.coffee
@@ -28,7 +28,7 @@ class SearchSuggestionStore extends NylasStore
     @listenTo SearchActions.searchBlurred, @_onSearchBlurred
 
   _onPerspectiveChanged: =>
-    @_searchQuery = FocusedPerspectiveStore.current()?.searchQuery ? ""
+    @_searchQuery = FocusedPerspectiveStore.current().searchQuery ? ""
     @trigger()
 
   _onQueryChanged: (query) =>
diff --git a/internal_packages/thread-list/lib/draft-list-store.coffee b/internal_packages/thread-list/lib/draft-list-store.coffee
index 798e3e1ae..277325874 100644
--- a/internal_packages/thread-list/lib/draft-list-store.coffee
+++ b/internal_packages/thread-list/lib/draft-list-store.coffee
@@ -25,7 +25,7 @@ class DraftListStore extends NylasStore
 
   _queryForCurrentAccount: =>
     matchers = [Message.attributes.draft.equal(true)]
-    account = FocusedPerspectiveStore.current()?.account
+    account = FocusedPerspectiveStore.current().account
 
     if account?
       matchers.push(Message.attributes.accountId.equal(account.id))
diff --git a/src/flux/stores/category-store.coffee b/src/flux/stores/category-store.coffee
index 4ce62170f..2657a5d57 100644
--- a/src/flux/stores/category-store.coffee
+++ b/src/flux/stores/category-store.coffee
@@ -41,19 +41,16 @@ class CategoryStore extends NylasStore
   # Public: Returns all of the standard categories for the current account.
   #
   standardCategories: (accountOrId) ->
-    return [] unless accountOrId
-    @_standardCategories[asAccountId(accountOrId)]
+    @_standardCategories[asAccountId(accountOrId)] ? []
 
   hiddenCategories: (accountOrId) ->
-    return [] unless accountOrId
-    @_hiddenCategories[asAccountId(accountOrId)]
+    @_hiddenCategories[asAccountId(accountOrId)] ? []
 
   # Public: Returns all of the categories that are not part of the standard
   # category set.
   #
   userCategories: (accountOrId) ->
-    return [] unless accountOrId
-    @_userCategories[asAccountId(accountOrId)]
+    @_userCategories[asAccountId(accountOrId)] ? []
 
   # Public: Returns the Folder or Label object for a standard category name and
   # for a given account.
diff --git a/src/flux/stores/draft-store.coffee b/src/flux/stores/draft-store.coffee
index dd7058d3c..2ff560369 100644
--- a/src/flux/stores/draft-store.coffee
+++ b/src/flux/stores/draft-store.coffee
@@ -370,7 +370,7 @@ class DraftStore
 
   _onPopoutBlankDraft: =>
     # TODO Remove this when we add account selector inside composer
-    account = FocusedPerspectiveStore.current()?.account
+    account = FocusedPerspectiveStore.current().account
     account ?= AccountStore.accounts()[0]
 
     draft = new Message
@@ -408,7 +408,7 @@ class DraftStore
 
   _onHandleMailtoLink: (event, urlString) =>
     # TODO Remove this when we add account selector inside composer
-    account = FocusedPerspectiveStore.current()?.account
+    account = FocusedPerspectiveStore.current().account
     account ?= AccountStore.accounts()[0]
 
     try
diff --git a/src/flux/stores/unread-badge-store.coffee b/src/flux/stores/unread-badge-store.coffee
index 649e5f3c2..c2dc55cde 100644
--- a/src/flux/stores/unread-badge-store.coffee
+++ b/src/flux/stores/unread-badge-store.coffee
@@ -25,7 +25,7 @@ class UnreadBadgeStore extends NylasStore
     @_count
 
   _updateCount: =>
-    account = FocusedPerspectiveStore.current()?.account
+    account = FocusedPerspectiveStore.current().account
     category = CategoryStore.getStandardCategory(account, 'inbox')
     if category
       count = ThreadCountsStore.unreadCountForCategoryId(category.id) ? 0
diff --git a/src/flux/stores/workspace-store.coffee b/src/flux/stores/workspace-store.coffee
index a3e9324c7..88a0fd91d 100644
--- a/src/flux/stores/workspace-store.coffee
+++ b/src/flux/stores/workspace-store.coffee
@@ -55,7 +55,7 @@ class WorkspaceStore extends NylasStore
     'navigation:go-to-label'   : => ## TODO
 
   _setMailViewByName: (categoryName) ->
-    account = FocusedPerspectiveStore.current()?.account
+    account = FocusedPerspectiveStore.current().account
     category = CategoryStore.getStandardCategory(account, categoryName)
     return unless category
     view = MailboxPerspective.forCategory(category)