diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index 680cf48631..053447fc3e 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,8 +1,7 @@
 Shop.factory 'OrderCycle', ($resource, Product) ->
   new class OrderCycle
-    @order_cycle = {
+    @order_cycle:
       order_cycle_id: null
-    }
 
     set_order_cycle: (id = null)->
       new $resource("/shop/order_cycle").save {order_cycle_id: id}, ->
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 1862dfd0c6..dca51d71b5 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -27,7 +27,9 @@ class ShopController < BaseController
   private
 
   def set_distributor
-    @distributor = current_distributor 
+    unless @distributor = current_distributor 
+      redirect_to root_path
+    end
   end
 
   def set_order_cycles
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 7dfc43d289..0622910a6f 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -2,64 +2,72 @@ require 'spec_helper'
 
 describe ShopController do
   let(:d) { create(:distributor_enterprise) }
-  before do
-    controller.stub(:current_distributor).and_return d
+
+  it "redirects to the home page if no distributor is selected" do
+    spree_get :show
+    response.should redirect_to root_path
   end
 
-  describe "Selecting order cycles" do
-    it "should select an order cycle when only one order cycle is open" do
-      oc1 = create(:order_cycle, distributors: [d])
-      spree_get :show
-      controller.current_order_cycle.should == oc1
-    end
-
-    it "should not set an order cycle when multiple order cycles are open" do
-      oc1 = create(:order_cycle, distributors: [d])
-      oc2 = create(:order_cycle, distributors: [d])
-      spree_get :show
-      controller.current_order_cycle.should == nil
-    end
-    
-    it "should allow the user to post to select the current order cycle" do
-      oc1 = create(:order_cycle, distributors: [d])
-      oc2 = create(:order_cycle, distributors: [d])
-      
-      spree_post :order_cycle, order_cycle_id: oc2.id
-      response.should be_success
-      controller.current_order_cycle.should == oc2
-    end
-
-    it "should not allow the user to select an invalid order cycle" do
-      oc1 = create(:order_cycle, distributors: [d])
-      oc2 = create(:order_cycle, distributors: [d])
-      oc3 = create(:order_cycle, distributors: [create(:distributor_enterprise)])
-      
-      spree_post :order_cycle, order_cycle_id: oc3.id
-      response.status.should == 404
-      controller.current_order_cycle.should == nil
-
-    end
-  end
-
-
-  describe "returning products" do
-    let(:product) { create(:product) }
-    let(:order_cycle) { create(:order_cycle, distributors: [d]) }
+  describe "with a distributor in place" do
     before do
-      Spree::Product.stub(:all).and_return([product])
+      controller.stub(:current_distributor).and_return d
     end
 
-    it "returns products via json" do
-      controller.stub(:current_order_cycle).and_return order_cycle
-      xhr :get, :products
-      response.should be_success
-      response.body.should_not be_empty
+    describe "Selecting order cycles" do
+      it "should select an order cycle when only one order cycle is open" do
+        oc1 = create(:order_cycle, distributors: [d])
+        spree_get :show
+        controller.current_order_cycle.should == oc1
+      end
+
+      it "should not set an order cycle when multiple order cycles are open" do
+        oc1 = create(:order_cycle, distributors: [d])
+        oc2 = create(:order_cycle, distributors: [d])
+        spree_get :show
+        controller.current_order_cycle.should == nil
+      end
+      
+      it "should allow the user to post to select the current order cycle" do
+        oc1 = create(:order_cycle, distributors: [d])
+        oc2 = create(:order_cycle, distributors: [d])
+        
+        spree_post :order_cycle, order_cycle_id: oc2.id
+        response.should be_success
+        controller.current_order_cycle.should == oc2
+      end
+
+      it "should not allow the user to select an invalid order cycle" do
+        oc1 = create(:order_cycle, distributors: [d])
+        oc2 = create(:order_cycle, distributors: [d])
+        oc3 = create(:order_cycle, distributors: [create(:distributor_enterprise)])
+        
+        spree_post :order_cycle, order_cycle_id: oc3.id
+        response.status.should == 404
+        controller.current_order_cycle.should == nil
+      end
     end
 
-    it "does not return products if no order_cycle is selected" do
-      xhr :get, :products
-      response.status.should == 404
-      response.body.should be_empty
+
+    describe "returning products" do
+      let(:product) { create(:product) }
+      let(:order_cycle) { create(:order_cycle, distributors: [d]) }
+      before do
+        Spree::Product.stub(:all).and_return([product])
+      end
+
+      it "returns products via json" do
+        controller.stub(:current_order_cycle).and_return order_cycle
+        xhr :get, :products
+        response.should be_success
+        response.body.should_not be_empty
+      end
+
+      it "does not return products if no order_cycle is selected" do
+        xhr :get, :products
+        response.status.should == 404
+        response.body.should be_empty
+      end
     end
+
   end
 end