Fix exceptions, separate data objects