diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
index 027794953..b98473a29 100644
--- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
+++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
@@ -713,7 +713,7 @@ namespace BlackMisc
                             bool result = it.value()(tokens, package, package.path, lineNum);
                             if (!result)
                             {
-                                package.planes.back().hasErrors = true;
+                                if (! package.planes.empty()) { package.planes.back().hasErrors = true; }
                             }
                         }
                         else
diff --git a/src/xswiftbus/libxplanemp b/src/xswiftbus/libxplanemp
index 5c9b95d05..eeedeef0a 160000
--- a/src/xswiftbus/libxplanemp
+++ b/src/xswiftbus/libxplanemp
@@ -1 +1 @@
-Subproject commit 5c9b95d058b464d94aeb67ed3c4b0e359d07edf1
+Subproject commit eeedeef0a25b0bdad75b7c4b14dd71e525a3cfab