Merge "Handle error result returned from MTP API correctly." into nyc-dev