Change output a little bit and catch errors when tranforming the handshake.