[OTR] Better error handling when libotr 4.x is used.

And some cosmetic changes.