diff --git a/app/controllers/growls_controller.rb b/app/controllers/growls_controller.rb
index b7239c90..bf1898d4 100644
--- a/app/controllers/growls_controller.rb
+++ b/app/controllers/growls_controller.rb
@@ -5,7 +5,7 @@ def index
     subdomain = request.subdomain
     @user = User.where{display_name.matches subdomain}.first
 
-    return redirect_to home_path, :notice => "That user was not found."
+    return redirect_to home_path, :notice => "That user was not found." unless @user
 
     @growls = @user.get_growls(params[:type]).page(params[:page])
   end
diff --git a/spec/requests/points_spec.rb b/spec/requests/points_spec.rb
index 59f80d41..593fedf0 100644
--- a/spec/requests/points_spec.rb
+++ b/spec/requests/points_spec.rb
@@ -7,7 +7,7 @@
     context "User is logged in" do
       before(:each) do
         Capybara.app_host = "http://#{user.display_name}.hungrlr.dev"
-        login(user2)
+        login(user)
         visit root_path
       end
       it "adds a point when the user clicks it" do