Adding a new error message to skip.
Merge remote-tracking branch 'upstream/master'