Improving error handling
Merge branch 'master' of https://github.com/Miksu82/Garden