diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx
index 0067bec..7a96508 100755
--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
@@ -4515,16 +4515,16 @@ MK_VIII::TCFHandler::update_runway ()
   // the airport's reference point.
   AirportFilter filter(mk);
   const FGAirport *airport = globals->get_airports()->search(
-      mk_data(gps_latitude).get(), mk_data(gps_longitude).get(),
+      mk_data(gps_longitude).get(), mk_data(gps_latitude).get(),
 			0.5, filter);
 
   if (!airport) return;
   
-	  has_runway = true;
-
-	  FGRunway* _runway;
+	  FGRunway* _runway = NULL;
 	  select_runway(airport, _runway);
-
+    if (!_runway) return;
+    has_runway = true;
+    
 	  runway.center.latitude = _runway->latitude();
 	  runway.center.longitude = _runway->longitude();