Catch AttributeError
Merge branch 'master' of https://github.com/np1/pms