diff --git a/app/jobs/abf_worker/rpm_worker_observer.rb b/app/jobs/abf_worker/rpm_worker_observer.rb
index 75a38f9bd..f888bc89d 100644
--- a/app/jobs/abf_worker/rpm_worker_observer.rb
+++ b/app/jobs/abf_worker/rpm_worker_observer.rb
@@ -23,6 +23,13 @@ module AbfWorker
       item = find_or_create_item
       fill_container_data if status != STARTED
 
+      unless subject.valid?
+        item.update_attributes({status: BuildList::BUILD_ERROR})
+        subject.build_error(false)
+        subject.save(validate: false)
+        return
+      end
+
       rerunning_tests = subject.rerunning_tests?
 
       case status