Exception refactoting
Merge branch 'master' of https://github.com/barta3/TravelPlanner