better error checking for leftovers with elasticsearch