diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 077034024..7a53f3a4c 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -41,7 +41,7 @@ class DirectoryItemsController < ApplicationController
     more_params[:page] = page + 1
 
     # Put yourself at the top of the first page
-    if current_user.present? && page == 0 && result[0].user_id != current_user.id
+    if result.present? && current_user.present? && page == 0 && result[0].user_id != current_user.id
       your_item = DirectoryItem.where(period_type: period_type, user_id: current_user.id).first
       result.insert(0, your_item) if your_item
     end
diff --git a/spec/controllers/directory_items_controller_spec.rb b/spec/controllers/directory_items_controller_spec.rb
index 8f46747d8..c100b3c19 100644
--- a/spec/controllers/directory_items_controller_spec.rb
+++ b/spec/controllers/directory_items_controller_spec.rb
@@ -11,6 +11,21 @@ describe DirectoryItemsController do
     response.should_not be_success
   end
 
+  context "without data" do
+
+    context "and a logged in user" do
+      let!(:user) { log_in }
+
+      it "succeeds" do
+        xhr :get, :index, period: 'all'
+        response.should be_success
+        json = ::JSON.parse(response.body)
+      end
+    end
+
+  end
+
+
   context "with data" do
     before do
       Fabricate(:user)