Update HasPending logic to account for out-of-order errors

Update HasPending logic to account for out-of-order errors #498