Ensure MOC isn't save when error is mapped

Fixes #1735