Merge pull request #4530 from twz123/pid-in-error-strings

Merge pull request #4530 from twz123/pid-in-error-strings #420