TODO ---- - Fix error reporting blowout when key-exchange auth fails