Updated for go-util changes to error/signal handling.