diff --git a/performance_assessment/src/taw/defaultMethods/aircraft.cpp b/performance_assessment/src/taw/defaultMethods/aircraft.cpp
index 17259384c40ad4f13363790f9b50fab8ba294476..d19510960201e31b6c78056e82c0a2d2a0775eb6 100644
--- a/performance_assessment/src/taw/defaultMethods/aircraft.cpp
+++ b/performance_assessment/src/taw/defaultMethods/aircraft.cpp
@@ -216,6 +216,9 @@ double aircraft::ROC(double Mass, double Alt, double Mach, double fACC, string C
     } catch (const std::string& e) {
         tempDrag = ac_thrust;  // In case of missing polar data a gamma of 0 is forced
     }
+    if (std::isnan(tempDrag)) {
+        tempDrag = ac_thrust;  // In case of missing polar data (but NaN-flavoured)
+    }
     double tempGamma = asin((ac_thrust - tempDrag) / (G_FORCE * Mass) / (1. + fACC));  // because not with const. TAS but with const. IAS or Ma is risen
                                                                                     //--> Introduction of facc: Commutation factor: facc = V/g * dV/dh; see table 11.1 p.232
     double tempLiftCoefficient = 2.*(G_FORCE * Mass * cos(tempGamma))