tjfontaine fix wrong logic, should check that field exists

Users who have contributed to this file

• tjfontaine
• deanmalmgren