[#84330270] Updated to controller to handle data integrity issues on staging.