New build
Better exception wrapping/mapping.
Merge branch 'master' into release