Error handling has been improved in MSGStore.
Merge branch 'ew-dev' into development