Dodgy - Exception is caught when Exception is not thrown
Merge remote-tracking branch 'origin/master'