Switched to new exception structure.