Fix merge issue
Better error display
Merge branch 'New3' of github.com:fitzchak/ravendb into New3