api/v3/utils - Redo 16404fbb4 for preventing fatal error (without causing regressions)
Merge pull request #712 from totten/fix-allfields-crash

api/v3/utils - Redo 16404fbb4 for preventing fatal error