added some error handling
Merge branch 'master' of github.com:HGF/flight_finder