Merge pull request #356 from angathorion/datastore-exception-handling
Data store exception handling. Fixes #307

(main@53eb61b32892b47b52001fc4a8a8ca38c8e740fd)