Comment 9 for bug 1175028

I've chased upstream on this issue again; the appropriate exceptions should be in the right headers for the next release of the 2.5.x series which is scheduled for the 5th September.