diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
index 52cbc750ae..200faeaf8f 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
@@ -268,7 +268,7 @@ public class XSLFTableCell extends XSLFTextShape implements TableCell<XSLFShape,
     private CTLineProperties setBorderDefaults(BorderEdge edge) {
         final CTLineProperties ln = getCTLine(edge, true);
         if (ln == null) {
-            return null;
+            throw new IllegalStateException("CTLineProperties couldn't be initialized");
         }
 
         if (ln.isSetNoFill()) {
@@ -366,6 +366,9 @@ public class XSLFTableCell extends XSLFTextShape implements TableCell<XSLFShape,
         }
 
         CTLineProperties ln = setBorderDefaults(edge);
+        if (!ln.isSetPrstDash()) {
+            ln.addNewPrstDash();
+        }
         ln.getPrstDash().setVal(STPresetLineDashVal.Enum.forInt(dash.ooxmlId));
     }
 
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
index cce48c53a0..ad54c3eccd 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
@@ -106,6 +106,10 @@ public final class SXSSFPicture implements Picture {
     @Override
     public void resize(double scale){
         XSSFClientAnchor anchor = getClientAnchor();
+        if (anchor == null) {
+            logger.log(POILogger.WARN, "picture is not anchored via client anchor - ignoring resize call");
+            return;
+        }
 
         XSSFClientAnchor pref = getPreferredSize(scale);
 
@@ -139,6 +143,10 @@ public final class SXSSFPicture implements Picture {
      */
     public XSSFClientAnchor getPreferredSize(double scale){
         XSSFClientAnchor anchor = getClientAnchor();
+        if (anchor == null) {
+            logger.log(POILogger.WARN, "picture is not anchored via client anchor - ignoring resize call");
+            return null;
+        }
 
         XSSFPictureData data = getPictureData();
         Dimension size = getImageDimension(data.getPackagePart(), data.getPictureType());