Handle more handshake errors