[MTD] CFI-0002 - Improve error checking