Minor error handling fixes
experimenting
+ last
Merge branch 'tmp' of https://github.com/suhajdab/home-v2 into tmp