Fixed handling of whitespace messages