robustness for errors
Merge pull request #1 from TheThingSystem/master

robustness for errors