Change withError to withErrorContaining

The chances of us ever being able to squash all of the corner cases around message formatting are
slim to none.