Merge pull request #25 from TheBoolean/master

fix rare fatal error