diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 69cec92ad..dc66d9ae5 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -1406,7 +1406,7 @@ RASAeroExport.error19 = Inside diameter of '%s' must be greater than 0.
 RASAeroExport.error20 = Fin set '%s' must have a fin count between 3 and 8.
 RASAeroExport.error21 = RASAero only supports apogee and altitude deployment events for parachute '%s', not '%s'
 RASAeroExport.error22 = First component of the sustainer must be a nose cone.
-RASAeroExport.error23 = Second component of the sustainer must be a body tube.
+RASAeroExport.error23 = Second component of the sustainer must be a body tube (or boattail).
 RASAeroExport.error24 = A nose cone can only be the first component of the rocket.
 RASAeroExport.error25 = Invalid stage number '%d' for simulation '%s'
 RASAeroExport.error26 = RASAero only supports conical transitions.
diff --git a/core/src/net/sf/openrocket/file/rasaero/export/RocketDesignDTO.java b/core/src/net/sf/openrocket/file/rasaero/export/RocketDesignDTO.java
index 30a9e3938..d2a36ddda 100644
--- a/core/src/net/sf/openrocket/file/rasaero/export/RocketDesignDTO.java
+++ b/core/src/net/sf/openrocket/file/rasaero/export/RocketDesignDTO.java
@@ -90,7 +90,8 @@ public class RocketDesignDTO {
                 if (i == 0 && !(component instanceof NoseCone)) {
                     errors.add(trans.get("RASAeroExport.error22"));
                     return;
-                } else if (i == 1 && !(component instanceof BodyTube)) {
+                } else if (i == 1 && !(component instanceof BodyTube ||
+                        (component instanceof Transition && !(component instanceof NoseCone) && (i == sustainer.getChildCount() - 1)))) {
                     errors.add(trans.get("RASAeroExport.error23"));
                     return;
                 }