Fixed some old-style exceptions

These had been missed as they're split over multiple lines.