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

Data store exception handling. Fixes #307