diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 546db0a74..1425f7f77 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -2,7 +2,7 @@ class PhotosController < ApplicationController
   before_filter :authenticate_user!
   
   def create
-    begin
+    #begin
       @photo = Photo.instantiate(params[:photo])
       @photo.person = current_user
 
@@ -16,10 +16,10 @@ class PhotosController < ApplicationController
         render :action => 'album#new'
       end
 
-    rescue
-      flash[:error] = "Photo upload failed.  Are you sure that was an image?"
-      redirect_to Album.first(:id => params[:photo][:album_id])
-    end
+    #rescue
+    #  flash[:error] = "Photo upload failed.  Are you sure that was an image?"
+    #  redirect_to Album.first(:id => params[:photo][:album_id])
+    #end
   end
   
   def new
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 60b55e182..54533d019 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -4,7 +4,7 @@ class ImageUploader < CarrierWave::Uploader::Base
   storage :grid_fs
 
   def store_dir
-    "uploads"
+    "files/#{model.id}"
   end
 
   def extension_white_list
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 8ac46d5d1..cdcfe077f 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,7 +1,7 @@
 CarrierWave.configure do |config|
-  #config.grid_fs_database = "#diaspora-#{Rails.env}"
-  #config.grid_fs_host = 'localhost'
-  #config.grid_fs_access_url = "/images"
+  config.grid_fs_database = "#diaspora-#{Rails.env}"
+  config.grid_fs_host = 'localhost'
+  config.grid_fs_access_url = "/images"
   config.storage = :grid_fs
   #config.storage = :file
 end