Fixes bug with enterprise-to-airport association

In certain conditions the association was not added correctly or
twice, which led to NullPointerExceptions. This has been fixed.