some error handling
Merge branch 'master' of https://github.com/Emigrate91/ChiDaBa.git
look and feel :-)