return error messages instead of nothing
Merge branch 'master' of github.com:Zucka/SmartHouse