Improve error messages
Fix ObjectStore.set which joined when it was not needed