Add error handling
Merge branch 'master' of github.com:JIANXXU/DepartureTimeApp