Fix issue #70. Test for presence of all fields first