Exception catching
Merge branch 'master' of github.com:bertez/dev_gen