Slightly better missing airport handling