Remove file and add a nil check on filters