Update restore_error_field_values

app/controllers/form_controller.rb

@@ -106,7 +106,7 @@ private
     return unless previous_responses
 
     previous_responses_to_reset = previous_responses.reject do |key, value|
-      if @log.form.get_question(key, @log)&.type == "date" && @log[key]
+      if @log.form.get_question(key, @log)&.type == "date" && value.present?
         year = value.split("-").first.to_i
         year&.zero?
       else

app/helpers/form_page_error_helper.rb

@@ -15,6 +15,6 @@ module FormPageErrorHelper
 
   def all_pages_affected_by_errors(log)
     question_ids = (log.errors.map(&:attribute) - [:base]).uniq
-    question_ids.map { |id| log.form.get_question(id, log).page.id }.uniq
+    question_ids.map { |id| log.form.get_question(id, log)&.page&.id }.compact.uniq
   end
 end