some error handling improved
Merge branch 'master' of github.com:deniskoronchik/sc-web