diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 2ec10273c28d..ddc919f495d5 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -1486,20 +1486,18 @@ def displayPoint(self, point=None, last=None, plane=None, mask=None):
                     dp = plane.getLocalCoords(point)
 
             # set widgets
-            if self.mask in ['y','z']:
-                self.xValue.setText(displayExternal(dp.x,self.DECIMALS,'Length'))
-            else:
-                if dp:
+            if dp:
+                if self.mask in ['y','z']:
                     self.xValue.setText(displayExternal(dp.x,self.DECIMALS,'Length'))
-            if self.mask in ['x','z']:
-                self.yValue.setText(displayExternal(dp.y,self.DECIMALS,'Length'))
-            else:
-                if dp:
+                else:
+                    self.xValue.setText(displayExternal(dp.x,self.DECIMALS,'Length'))
+                if self.mask in ['x','z']:
                     self.yValue.setText(displayExternal(dp.y,self.DECIMALS,'Length'))
-            if self.mask in ['x','y']:
-                self.zValue.setText(displayExternal(dp.z,self.DECIMALS,'Length'))
-            else:
-                if dp:
+                else:
+                    self.yValue.setText(displayExternal(dp.y,self.DECIMALS,'Length'))
+                if self.mask in ['x','y']:
+                    self.zValue.setText(displayExternal(dp.z,self.DECIMALS,'Length'))
+                else:
                     self.zValue.setText(displayExternal(dp.z,self.DECIMALS,'Length'))
                     
             # set length and angle
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index cf598d049190..11ff3c6cd2b1 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -517,12 +517,11 @@ def undolast(self):
         "undoes last line segment"
         if (len(self.node) > 1):
             self.node.pop()
-            last = self.node[len(self.node)-1]
+            last = self.node[-1]
             if self.obj.Shape.Edges:
                 edges = self.obj.Shape.Edges
                 if len(edges) > 1:
-                    edges.pop()
-                    newshape = Part.Wire(edges)
+                    newshape = Part.makePolygon(self.node)
                     self.obj.Shape = newshape
                 else:
                     self.obj.ViewObject.hide()