diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index b985c0cfa..75d579bfb 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -70,7 +70,11 @@ class AspectsController < ApplicationController
 
   def show
     @aspect = current_user.aspects.where(:id => params[:id]).first
-    redirect_to aspects_path('a_ids[]' => @aspect.id)
+    if @aspect
+      redirect_to aspects_path('a_ids[]' => @aspect.id)
+    else
+      redirect_to aspects_path
+    end
   end
 
   def edit
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index 6ba088d7f..19bcae232 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -105,6 +105,10 @@ describe AspectsController do
       get :show, 'id' => @aspect0.id.to_s
       response.should be_redirect
     end
+    it 'redirects on an invalid id' do
+      get :show, 'id' => 4341029835
+      response.should be_redirect
+    end
   end
 
   describe "#create" do