Removes check for unused field
Improves error message copy