[PATCH 5.4 094/159] mcb: fix error handling for different scenarios when parsing