Exceptions fixed
Merge branch 'traveller' of https://github.com/00stefan00/ITACT_GetConnected into traveller