upstream error handling
working on storage...