エラー処理の修正
Merge branch 'master' of https://github.com/abe00makoto/ocean