1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index 91d16ca97a..40ab37b5d2 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -33,6 +33,9 @@ module ActiveRecord
           @previously_changed = changes
           @changed_attributes.clear
         end
+        rescue
+          IdentityMap.remove(self) if IdentityMap.enabled?
+          raise
       end
 
       # <tt>reload</tt> the record and clears changed attributes.