added stronger check for field existence (in document mapping)