A bit of reorganization with the exception mess