Tweak failure handling