diff --git a/src/RWStepBasic/RWStepBasic_RWProduct.cxx b/src/RWStepBasic/RWStepBasic_RWProduct.cxx
index 63a8754ec5..38efe20277 100644
--- a/src/RWStepBasic/RWStepBasic_RWProduct.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProduct.cxx
@@ -91,7 +91,14 @@ void RWStepBasic_RWProduct::WriteStep
 
 	// --- own field : description ---
 
-	SW.Send(ent->Description());
+	if (!ent->Description().IsNull())
+	{
+		SW.Send(ent->Description());
+	}
+	else
+	{
+		SW.SendUndef();
+	}
 
 	// --- own field : frameOfReference ---
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinition.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinition.cxx
index 6ff8bb97d9..3a64a42529 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinition.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinition.cxx
@@ -78,7 +78,14 @@ void RWStepBasic_RWProductDefinition::WriteStep
 
 	// --- own field : description ---
 
-	SW.Send(ent->Description());
+	if (!ent->Description().IsNull())
+	{
+		SW.Send(ent->Description());
+	}
+	else
+	{
+		SW.SendUndef();
+	}
 
 	// --- own field : formation ---
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cxx b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cxx
index 895908511e..cbc08a6d56 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cxx
@@ -71,7 +71,14 @@ void RWStepBasic_RWProductDefinitionFormation::WriteStep
 
 	// --- own field : description ---
 
-	SW.Send(ent->Description());
+	if (!ent->Description().IsNull())
+	{
+		SW.Send(ent->Description());
+	}
+	else
+	{
+		SW.SendUndef();
+	}
 
 	// --- own field : ofProduct ---
 
diff --git a/tests/bugs/step/bug25168 b/tests/bugs/step/bug25168
index 2d317cf678..fca792b1eb 100644
--- a/tests/bugs/step/bug25168
+++ b/tests/bugs/step/bug25168
@@ -1,5 +1,3 @@
-puts "TODO OCC25188 ALL: Error: File "
-
 puts "========"
 puts "OCC25168"
 puts "========"