Add error proc
Merge branch 'refs/heads/master' into y-okubo