Yep, definitely should - I was going to do that in a separate PR (evaluating all the possible failure json's that ES can give back and handling those)