diff --git a/src/BRepFill/BRepFill_Pipe.cxx b/src/BRepFill/BRepFill_Pipe.cxx
index 2d7f74b36f..d51a3c9811 100644
--- a/src/BRepFill/BRepFill_Pipe.cxx
+++ b/src/BRepFill/BRepFill_Pipe.cxx
@@ -760,8 +760,11 @@ TopoDS_Shape BRepFill_Pipe::MakeShape(const TopoDS_Shape& S,
     TopoDS_Face F;
     for (ii=InitialLength+1; ii<=myFaces->ColLength(); ii++) {
       for (jj=1; jj<=myFaces->RowLength(); jj++) {
-	F = TopoDS::Face(myFaces->Value(ii, jj));
-	if (!F.IsNull()) B.Add(result, F);
+        if (myFaces->Value(ii, jj).ShapeType() == TopAbs_FACE)
+        {
+          F = TopoDS::Face(myFaces->Value(ii, jj));
+          if (!F.IsNull()) B.Add(result, F);
+        }
       }
     }
 
diff --git a/src/GeomFill/GeomFill_Sweep.cxx b/src/GeomFill/GeomFill_Sweep.cxx
index 6e8ce1426c..b47d6ab0e6 100644
--- a/src/GeomFill/GeomFill_Sweep.cxx
+++ b/src/GeomFill/GeomFill_Sweep.cxx
@@ -953,7 +953,12 @@ static Standard_Boolean IsSweepParallelSpine (const Handle(GeomFill_LocationLaw)
 	    // (2.2.a) Cylindre
             // si la line est orthogonale au plan de rotation
 	    SError = error;
-	    gp_Ax3 Axis(CentreOfSurf, Dir.Direction(), DS);
+      //
+      gp_Ax3 Axis(CentreOfSurf, Dir.Direction());
+      if (DS.SquareMagnitude() > gp::Resolution())
+      {
+        Axis.SetXDirection(DS);
+      }
 	    S = new (Geom_CylindricalSurface) 
 	            (Axis, L.Distance(CentreOfSurf));
 	    Ok = Standard_True;
diff --git a/tests/bugs/modalg_7/bug26568 b/tests/bugs/modalg_7/bug26568
index 7d73494d6e..4bc7705632 100644
--- a/tests/bugs/modalg_7/bug26568
+++ b/tests/bugs/modalg_7/bug26568
@@ -1,10 +1,6 @@
-puts "TODO OCC26568 ALL: An exception was caught"
-puts "TODO OCC26568 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO OCC26568 ALL: TEST INCOMPLETE"
-
-puts "========"
-puts "OCC26568"
-puts "========"
+puts "============================================================="
+puts "OCC26568 - Modeling Algorithms - Crash when creating pipe"
+puts "============================================================="
 puts ""
 ################################
 # Exception when creating pipe
@@ -15,4 +11,14 @@ explode b f
 circle c 0 0 0 0 1 0 10
 mkedge e c
 wire w e
-pipe p w b_1
+pipe result w b_1
+
+checkshape result
+
+checknbshapes result -solid 1 -shell 1 -face 3 -wire 3 -edge 7 -vertex 4
+
+set tolres [checkmaxtol result]
+
+if { ${tolres} > 2.e-7} {
+   puts "Error: bad tolerance of result"
+}