[PATCH 6.1 248/372] mcb: fix error handling for different scenarios when parsing