error handeling fix
Merge branch 'master' of https://github.com/mjuu/Workshops