Bottleneck exceptions

[samdeane]

Whilst I was debugging the crash, a while back, I put all the exception throwing through a couple of functions, to make it easier to breakpoint / log them.

It turned out to be a red herring, but here's the work, just in case you want to incorporate it anyway (it's arguably a little bit of a reduction of duplication).