Merge "MapClient parse bad messages"