Added a null check on the entryList so that if the schema is not as expected, there is no NullPointerException caused. (cherry picked from commit 3295aec1)