diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index caa15d52d..6730aee29 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -164,7 +164,11 @@ class PhotosController < ApplicationController
 
       respond_with @photo
     else
-      redirect_to :back
+      begin
+        redirect_to :back
+      rescue
+        redirect_to aspects_path
+      end
     end
 
   end