Better testing of intentional exceptions
Merge branch 'master' into reactor
Better testing of intentional exceptions