Document the error types.
Merge branch 'master' into Xcode6