Complete return path for local errors to consumers.
Merge origin/master