Added current airport and better error reporting