Better handling of errors
Merge branch 'New3' of github.com:ayende/ravendb into New3