Added check to make sure fields exist where we expect them to