3 files changed, 3 insertions, 3 deletions
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index bd73a65c9..e7dcc559f 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -335,7 +335,7 @@ sp_flowtext_bbox(SPItem const *item, Geom::Affine const &transform, SPItem::BBox
 
     // Add stroke width
     // FIXME this code is incorrect
-    if (type == SPItem::VISUAL_BBOX && !item->style->stroke.isNone()) {
+    if (bbox && type == SPItem::VISUAL_BBOX && !item->style->stroke.isNone()) {
         double scale = transform.descrim();
         bbox->expandBy(0.5 * item->style->stroke_width.computed * scale);
     }
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index fc248824d..a9c1b2a4b 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -367,7 +367,7 @@ sp_text_bbox(SPItem const *item, Geom::Affine const &transform, SPItem::BBoxType
     Geom::OptRect bbox = SP_TEXT(item)->layout.bounds(transform);
 
     // FIXME this code is incorrect
-    if (type == SPItem::VISUAL_BBOX && !item->style->stroke.isNone()) {
+    if (bbox && type == SPItem::VISUAL_BBOX && !item->style->stroke.isNone()) {
         double scale = transform.descrim();
         bbox->expandBy(0.5 * item->style->stroke_width.computed * scale);
     }
diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp
index ac20ce098..833743d24 100644
--- a/src/sp-tref.cpp
+++ b/src/sp-tref.cpp
@@ -336,7 +336,7 @@ sp_tref_bbox(SPItem const *item, Geom::Affine const &transform, SPItem::BBoxType
 
     // Add stroke width
     // FIXME this code is incorrect
-    if (type == SPItem::VISUAL_BBOX && !item->style->stroke.isNone()) {
+    if (bbox && type == SPItem::VISUAL_BBOX && !item->style->stroke.isNone()) {
         double scale = transform.descrim();
         bbox->expandBy(0.5 * item->style->stroke_width.computed * scale);
     }