UPdated the airports controller to handle null pointer