Correctly bubble up failures (you can test this with Abort)
Small ui change for demo