[PATCH 6.5 344/491] mcb: fix error handling for different scenarios when parsing