Add additional null check on ES response