fixed all error checks
Merge branch 'master' of https://github.com/lrbloch/18349