added better error handling
Merge branch 'master' of github.com:hzahradnik/aic_group5_topic3