Fix error handling
Merge pull request #2 from oahiroaki/remove-exception

Fix error handling