diff --git a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
index 0f32bb142..eb623a051 100644
--- a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
+++ b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 
 import net.sf.openrocket.aerodynamics.AerodynamicForces;
 import net.sf.openrocket.aerodynamics.FlightConditions;
+import net.sf.openrocket.logging.SimulationAbort;
 import net.sf.openrocket.logging.WarningSet;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.masscalc.RigidBody;
@@ -330,7 +331,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
 		store.rocketMass = structureMassData.add( store.motorMass );
 
 		if (store.rocketMass.getMass() < MathUtil.EPSILON) {
-			throw new SimulationException(trans.get("SimulationStepper.error.totalMassZero"));
+			status.abortSimulation(SimulationAbort.Cause.ACTIVEMASSZERO);
 		}
 		
 		// Calculate the forces from the aerodynamic coefficients