Better handling of bad feeds