CRM-15456 - Add safety checks to avoid errors when updating tabs
Merge pull request #4363 from colemanw/CRM-15456

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