Fix error sending bugs