diff --git a/Doc/CHANGELOG.TXT b/Doc/CHANGELOG.TXT
index adcdb2cc..bb70437a 100644
--- a/Doc/CHANGELOG.TXT
+++ b/Doc/CHANGELOG.TXT
@@ -41,6 +41,7 @@ Changes between Oolite 1.80 and Oolite 1.80.1:
 * Fixed key 5 switching to status screen when used during save game
   filename entry.
 * Fix Linux uninstall script error handling
+* Fix errors with escape pod launch from subentities
 
 -------------------------------------------------------------------------------
 
diff --git a/src/Core/Entities/ShipEntity.m b/src/Core/Entities/ShipEntity.m
index 5f740cda..32543a68 100644
--- a/src/Core/Entities/ShipEntity.m
+++ b/src/Core/Entities/ShipEntity.m
@@ -11657,7 +11657,7 @@ Vector positionOffsetForShipInRotationToAlignment(ShipEntity* ship, Quaternion q
 	
 	Quaternion  jetto_orientation = kIdentityQuaternion;
 	Vector  vel, v_eject, v_eject_normal;
-	HPVector  rpos = position;
+	HPVector  rpos = [self absolutePositionForSubentity];
 	double jetto_roll =	0;
 	double jetto_pitch = 0;
 	
@@ -12415,6 +12415,11 @@ Vector positionOffsetForShipInRotationToAlignment(ShipEntity* ship, Quaternion q
 			}
 		}
 	}
+	else if (EXPECT([self isSubEntity]))
+	{
+		// may still have launched passenger pods even if no crew
+		[self removeEquipmentItem:@"EQ_ESCAPE_POD"];
+	}
 	else
 	{
 		// this shouldn't happen any more!