Handle failure better in -repl