New build
Better exception wrapping/mapping.