diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb index 9fb0fe243..2f6ce6483 100644 --- a/app/controllers/form_controller.rb +++ b/app/controllers/form_controller.rb @@ -103,7 +103,7 @@ private end if question.id == "owning_organisation_id" - owning_organisation = Organisation.find(result["owning_organisation_id"]) + owning_organisation = result["owning_organisation_id"].present? ? Organisation.find(result["owning_organisation_id"]) : nil if current_user.support? && @log.managing_organisation.blank? && owning_organisation&.managing_agents&.empty? result["managing_organisation_id"] = owning_organisation.id elsif owning_organisation&.absorbing_organisation == current_user.organisation