Improve error handling not to panic
Merge pull request #5 from gunyarakun/master

Improve error handling not to panic