Attempt to improve JONI usage, including propagation of exceptions.
Rev rephract to not break Maps.