Add protection against too long messages