Case 51818 strip errmsg

Even though this is going to change and it wasn't obvious how, it seemed like a good exercise to navigate the code to where this change belonged, so here it is.