Updates to resolve issues around catching filter errors