More defensive checks against errored feeds after real life usage