Merge "Improved error-handling in Rfc822Tokenizer"