Cleaning up exception handling to now wrap runtime exceptions in event store