diff --git a/lib/simple_captcha/simple_captcha_data.rb b/lib/simple_captcha/simple_captcha_data.rb
index 2339ded..b4c6246 100644
--- a/lib/simple_captcha/simple_captcha_data.rb
+++ b/lib/simple_captcha/simple_captcha_data.rb
@@ -19,14 +19,18 @@ def get_data(key)
       end
 
       def remove_data(key)
-        where(["#{connection.quote_column_name(:key)} = ?", key]).delete_all
-        clear_old_data(1.hour.ago)
+        begin
+          where(["#{connection.quote_column_name(:key)} = ?", key]).delete_all
+          clear_old_data(1.hour.ago)
+        rescue StandardError => err
+          Rails.logger.error "#{err.class} #{err.message}"
+        end
       end
 
       def clear_old_data(time = 1.hour.ago)
         return unless Time === time
         where(["#{connection.quote_column_name(:updated_at)} < ?", time]).delete_all
-      rescue ActiveRecord::Deadlocked => err
+      rescue StandardError => err
         Rails.logger.error "#{err.class} #{err.message}"
       end
     end