Replaced bare except with except Exception
#171 - do not increment version yet
Merge branch 'pistolero-develop' into develop