Fix handling unmatched messages