prevent random errors
Merge pull request #40 from ticosax/master

prevent random errors