more error handles
Merge branch 'master' of github.com:WeAreDev3/jetstream