CRM-15456 - Add safety checks to avoid errors when updating tabs