diff --git a/app/models/slideshow_block.rb b/app/models/slideshow_block.rb
index 95f6ddd..a34adbb 100644
--- a/app/models/slideshow_block.rb
+++ b/app/models/slideshow_block.rb
@@ -10,7 +10,7 @@ class SlideshowBlock < Block
   end
 
   def gallery
-    gallery_id ? Folder.find(gallery_id) : nil
+    gallery_id ? Folder.find(:first, :conditions => { :id => gallery_id }) : nil
   end
 
   def block_images
diff --git a/test/unit/slideshow_block_test.rb b/test/unit/slideshow_block_test.rb
index 9e04c06..32367bf 100644
--- a/test/unit/slideshow_block_test.rb
+++ b/test/unit/slideshow_block_test.rb
@@ -15,6 +15,10 @@ class SlideshowBlockTest < ActiveSupport::TestCase
     assert_equal gallery, slideshow_block.gallery
   end
 
+  should 'not crash if referencing unexisting folder' do
+    assert_nil SlideshowBlock.new(:gallery_id => -999).gallery
+  end
+
   should 'default interval between transitions is 4 seconds' do
     slideshow = SlideshowBlock.new
     assert_equal 4, slideshow.interval
--
libgit2 0.21.2