Fix for a traceback I got while updating my gmail account settings
Merge pull request #23 from mikedougherty/master

Fix incorrect logic around updating service components