diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
index 8be86f099..91006b145 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
@@ -283,10 +283,8 @@ public final class HSLFFreeformShape extends HSLFAutoShape implements FreeformSh
         Iterator<byte[]> vertIter = verticesProp.iterator();
         Iterator<byte[]> segIter = segmentsProp.iterator();
         
-        byte segPushBack[] = null;
         while (vertIter.hasNext() && segIter.hasNext()) {
-            byte[] segElem = (segPushBack != null) ? segPushBack : segIter.next();
-            segPushBack = null;
+            byte[] segElem = segIter.next();
             PathInfo pi = getPathInfo(segElem);
             switch (pi) {
                 case escape: {
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
index 0a13a62d5..10adc71c8 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
@@ -310,12 +310,13 @@ public abstract class HSLFSimpleShape extends HSLFShape implements SimpleShape<H
     public CustomGeometry getGeometry() {
         PresetGeometries dict = PresetGeometries.getInstance();
         ShapeType st = getShapeType();
-        String name = st.getOoxmlName();
+        String name = (st != null) ? st.getOoxmlName() : null;
         CustomGeometry geom = dict.get(name);
-        if(geom == null) {
-            if (name == null && st != null) name = st.toString();
+        if (geom == null) {
+            if (name == null) {
+                name = (st != null) ? st.toString() : "<unknown>";
+            }
             logger.log(POILogger.WARN, "No preset shape definition for shapeType: "+name);
-            return null;
         }
 
         return geom;