Improve robustness
Merge pull request #1 from CloCkWeRX/master

Improve robustness