Fail safe
Merge pull request #38 from mattn/failsafe

Fail safe