Update to use PanicOnError