MS420: Improve error reporting