Fix socorro.prod fails, due to changed locator
Merge pull request #200 from AlinT/fix_socorro_prod_fails

Fix socorro.prod fails, due to changed locator
fix except issue
Merge pull request #201 from AlexLakatos/master

fix except issue
pep8 review
Merge pull request #202 from AlexLakatos/master

fix pep8 issues