perf help: Remove use of die and handle errors