Move manifest store errors to where they happen