Fixed null pointer and added airport database.