Add error resiliance