diff --git a/lib/octopoller.rb b/lib/octopoller.rb
index 0d4de1d..f1c006e 100644
--- a/lib/octopoller.rb
+++ b/lib/octopoller.rb
@@ -15,34 +15,44 @@ class TooManyAttemptsError < StandardError; end
   #           - Re-runs until something is returned or the timeout/retries is reached
   # raise     - Raises an Octopoller::TimeoutError if the timeout is reached
   # raise     - Raises an Octopoller::TooManyAttemptsError if the retries is reached
-  def poll(wait: 1, timeout: nil, retries: nil)
+  def poll(wait: 1, timeout: nil, retries: nil, errors: [])
     wait = 0 if [nil, false].include?(wait)
+    errors = Array(errors)
+    Octopoller.validate_arguments(wait, timeout, retries, errors)
 
-    Octopoller.validate_arguments(wait, timeout, retries)
     exponential_backoff = (wait == :exponentially)
-
+    error = nil
     wait = 0.25 if exponential_backoff
+
     if timeout
       start = Time.now.utc
       while Time.now.utc < start + timeout
-        block_value = yield
+        begin
+          block_value = yield
+        rescue *errors => error
+          block_value = :re_poll
+        end
         return block_value unless block_value == :re_poll
         sleep wait
         wait *= 2 if exponential_backoff
       end
-      raise TimeoutError, "Polling timed out patiently"
+      raise TimeoutError.new("Polling timed out patiently"), cause: error
     else
       (retries + 1).times do
-        block_value = yield
+        begin
+          block_value = yield
+        rescue *errors => error
+          block_value = :re_poll
+        end
         return block_value unless block_value == :re_poll
         sleep wait
         wait *= 2 if exponential_backoff
       end
-      raise TooManyAttemptsError, "Polled maximum number of attempts"
+      raise TooManyAttemptsError.new("Polled maximum number of attempts"), cause: error
     end
   end
 
-  def self.validate_arguments(wait, timeout, retries)
+  def self.validate_arguments(wait, timeout, retries, errors)
     if (timeout.nil? && retries.nil?) || (timeout && retries)
       raise ArgumentError, "Must pass an argument to either `timeout` or `retries`"
     end
@@ -50,6 +60,9 @@ def self.validate_arguments(wait, timeout, retries)
     raise ArgumentError, "Cannot wait backwards in time" if !exponential_backoff && wait.negative?
     raise ArgumentError, "Timed out without even being able to try" if timeout&.negative?
     raise ArgumentError, "Cannot retry something a negative number of times" if retries&.negative?
+    unless errors.all? { |error| error.is_a?(Class) && error < StandardError }
+      raise ArgumentError, "Errors must be classes that inherit from StandardError"
+    end
   end
 
   module_function :poll