These seem to be multiple things going on in this patch, one is popping other errors off the stack, the other is  some cleanup with strings, can you make that a seperate patch?