diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index 9fea60778..4ae302fff 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -67,24 +67,6 @@
 using namespace std;
 
 
-//===========================================================================
-// Helper for Body
-//===========================================================================
-
-PartDesign::Body *getBody(void)
-{
-    if(!PartDesignGui::ActivePartObject){
-        QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No active Body"),
-            QObject::tr("In order to use PartDesign you need an active Body object in the document. "
-                        "Please make one active or create one. If you have a legacy document "
-                        "with PartDesign objects without Body, use the transfer function in "
-                        "PartDesign to put them into a Body."
-                        ));
-    }
-    return PartDesignGui::ActivePartObject;
-
-}
-
 const char* BasePlaneNames[3] = {"Body_PlaneXY", "Body_PlaneYZ", "Body_PlaneXZ"};
 
 //===========================================================================
@@ -176,7 +158,7 @@ CmdPartDesignMoveTip::CmdPartDesignMoveTip()
 
 void CmdPartDesignMoveTip::activated(int iMsg)
 {
-    PartDesign::Body *pcActiveBody = getBody();
+    PartDesign::Body *pcActiveBody = PartDesignGui::getBody();
     if(!pcActiveBody) return;
 
     std::vector<App::DocumentObject*> features = getSelection().getObjectsOfType(Part::Feature::getClassTypeId());
@@ -229,7 +211,7 @@ CmdPartDesignNewSketch::CmdPartDesignNewSketch()
 
 void CmdPartDesignNewSketch::activated(int iMsg)
 {
-    PartDesign::Body *pcActiveBody = getBody();
+    PartDesign::Body *pcActiveBody = PartDesignGui::getBody();
 
     // No PartDesign feature without Body past FreeCAD 0.13
     if(!pcActiveBody) return;
@@ -330,7 +312,7 @@ void CmdPartDesignNewSketch::activated(int iMsg)
             if (base) continue;
 
             // Check whether this plane belongs to the active body
-            PartDesign::Body* body = getBody();
+            PartDesign::Body* body = PartDesignGui::getBody();
             if (!body->hasFeature(*p)) {
                 status.push_back(PartDesignGui::FeaturePickDialog::otherBody);
                 continue;
@@ -430,7 +412,7 @@ bool CmdPartDesignNewSketch::isActive(void)
         }
 
         // Check whether this sketch belongs to the active body
-        PartDesign::Body* body = getBody();
+        PartDesign::Body* body = PartDesignGui::getBody();
         if (!body->hasFeature(*s)) {
             status.push_back(PartDesignGui::FeaturePickDialog::otherBody);
             continue;
@@ -468,7 +450,7 @@ bool CmdPartDesignNewSketch::isActive(void)
 void prepareSketchBased(Gui::Command* cmd, const std::string& which,
                         Part::Part2DObject*& sketch, std::string& FeatName, App::DocumentObject*& prevSolidFeature)
 {
-    PartDesign::Body *pcActiveBody = getBody();
+    PartDesign::Body *pcActiveBody = PartDesignGui::getBody();
     if (!pcActiveBody) return;
 
     // Get a valid sketch from the user
@@ -507,8 +489,8 @@ void prepareSketchBased(Gui::Command* cmd, const std::string& which,
     cmd->openCommand((std::string("Make ") + which).c_str());
     cmd->doCommand(cmd->Doc,"App.activeDocument().addObject(\"PartDesign::%s\",\"%s\")",which.c_str(), FeatName.c_str());
     if (prevSolidFeature != NULL)
-        // Set Base property to previous feature
-        cmd->doCommand(cmd->Doc,"App.activeDocument().%s.Base = App.activeDocument().%s",
+        // Set BaseFeature property to previous feature
+        cmd->doCommand(cmd->Doc,"App.activeDocument().%s.BaseFeature = App.activeDocument().%s",
                                     FeatName.c_str(),prevSolidFeature->getNameInDocument());
     if (nextSolidFeature != NULL) {
         // Insert mode
@@ -518,8 +500,8 @@ void prepareSketchBased(Gui::Command* cmd, const std::string& which,
                                   pcActiveBody->getNameInDocument(),
                                   pcActiveBody->getNameInDocument(),FeatName.c_str(),
                                   pcActiveBody->getNameInDocument());
-        // Reroute Base property of the next feature to this feature
-        cmd->doCommand(cmd->Doc,"App.activeDocument().%s.Base = App.activeDocument().%s",
+        // Reroute BaseFeature property of the next feature to this feature
+        cmd->doCommand(cmd->Doc,"App.activeDocument().%s.BaseFeature = App.activeDocument().%s",
                                   nextSolidFeature->getNameInDocument(), FeatName.c_str());
     } else {
         cmd->doCommand(cmd->Doc,"App.activeDocument().%s.Model = "
@@ -557,7 +539,7 @@ void finishSketchBased(const Gui::Command* cmd,
     cmd->doCommand(cmd->Gui,"Gui.Selection.clearSelection()");
     cmd->doCommand(cmd->Gui,"Gui.Selection.addSelection(App.ActiveDocument.ActiveObject)");
 
-    PartDesign::Body *pcActiveBody = getBody();
+    PartDesign::Body *pcActiveBody = PartDesignGui::getBody();
     if (pcActiveBody) {
         cmd->copyVisual(FeatName.c_str(), "ShapeColor", pcActiveBody->getNameInDocument());
         cmd->copyVisual(FeatName.c_str(), "LineColor", pcActiveBody->getNameInDocument());
diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index e98ba841f..d48ab0ddb 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -31,6 +31,7 @@
 #include <Mod/Sketcher/Gui/Workbench.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
+#include <Gui/MainWindow.h>
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
 #include <Gui/Control.h>
@@ -47,6 +48,26 @@ using namespace PartDesignGui;
     qApp->translate("Gui::TaskView::TaskWatcherCommands", "Create Geometry");
 #endif
 
+namespace PartDesignGui {
+//===========================================================================
+// Helper for Body
+//===========================================================================
+
+PartDesign::Body *getBody(void)
+{
+    if(!PartDesignGui::ActivePartObject){
+        QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No active Body"),
+            QObject::tr("In order to use PartDesign you need an active Body object in the document. "
+                        "Please make one active or create one. If you have a legacy document "
+                        "with PartDesign objects without Body, use the transfer function in "
+                        "PartDesign to put them into a Body."
+                        ));
+    }
+    return PartDesignGui::ActivePartObject;
+
+}
+
+}
 
 /// @namespace PartDesignGui @class Workbench
 TYPESYSTEM_SOURCE(PartDesignGui::Workbench, Gui::StdWorkbench)
diff --git a/src/Mod/PartDesign/Gui/Workbench.h b/src/Mod/PartDesign/Gui/Workbench.h
index dea16e27d..0b042a91d 100644
--- a/src/Mod/PartDesign/Gui/Workbench.h
+++ b/src/Mod/PartDesign/Gui/Workbench.h
@@ -48,6 +48,9 @@ extern Gui::Document                   *ActiveGuiDoc;
 extern App::Document                   *ActiveAppDoc;
 extern Gui::ViewProviderDocumentObject *ActiveVp;
 
+/// Return active body or show a warning message
+PartDesign::Body *getBody(void);
+
 /**
  * @author Werner Mayer
  */