Update guard to ignore the non-existing field mapping