diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java b/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
index 161a332b3..b6b4db673 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
@@ -84,12 +84,20 @@ public final class OLEShape extends Picture {
 
         //persist reference
         int ref = getExEmbed().getExOleObjAtom().getObjStgDataRef();
-        for (int i = 0; i < ole.length; i++) {
-            if(ole[i].getExOleObjStg().getPersistId() == ref) return ole[i];
 
+        ObjectData data = null;
+
+        for (int i = 0; i < ole.length; i++) {
+            if(ole[i].getExOleObjStg().getPersistId() == ref) {
+                data=ole[i];
+            }
         }
-        logger.log(POILogger.WARN, "OLE data not found");
-        return null;
+
+        if (data==null) {
+            logger.log(POILogger.WARN, "OLE data not found");
+        }
+
+        return data;
     }
 
     /**