diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
index c04f1c444d..c26396ec1d 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
@@ -160,6 +160,8 @@ TopoDS_Shape SketchBased::makeFace(std::list<TopoDS_Wire>& wires) const
     for (std::list<TopoDS_Wire>::iterator it = wires.begin(); it != wires.end(); ++it) {
         BRepBuilderAPI_MakeFace mkInnerFace(*it);
         const TopoDS_Face& inner_face = mkInnerFace.Face();
+        if (inner_face.IsNull())
+            return inner_face; // failure
         gp_Dir inner_axis(0,0,1);
         BRepAdaptor_Surface adapt(inner_face);
         if (adapt.GetType() == GeomAbs_Plane) {
diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
index 1cc0711135..e62ad1758a 100644
--- a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
@@ -64,6 +64,7 @@ TaskPocketParameters::TaskPocketParameters(ViewProviderPocket *PocketView,QWidge
     PartDesign::Pocket* pcPocket = static_cast<PartDesign::Pocket*>(PocketView->getObject());
     double l = pcPocket->Length.getValue();
 
+    ui->doubleSpinBox->setMaximum(INT_MAX);
     ui->doubleSpinBox->setValue(l);
     ui->doubleSpinBox->selectAll();