Change the error handling a bit based on feedback. Remove the unused handshake message.