[mcs] Add more error checks