Fix up what appear to be changes in the gibbon API
exceptional is a requirement. Not just for testing.