Merge branch 'error-handling' into for-linus