new exceptions handling
Merge remote-tracking branch 'troubadoour/master'