Done. Also, should these exception messages be marked for translation? I can't remember what we decided