Fixing up exception namespacing.