Error handling
Merge branch 'master' of https://github.com/Zoracka/ITMAT_PresentationTier.git