diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java
index 690d4f0..84b9082 100644
--- a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java
+++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java
@@ -185,7 +185,7 @@ public class GraphicConverterImpl2 implements GraphicConverter {
                 XStorable.class, xDocument);
             xStore.storeToURL ("private:stream", exportProps);
             outputStream.closeOutput();
-
+            
             byte[] result = outputStream.getBuffer();
             
             xDocument.dispose(); 
diff --git a/source/java/writer2latex/util/SimpleXMLParser.java b/source/java/writer2latex/util/SimpleXMLParser.java
index ad2d82a..31f4fce 100644
--- a/source/java/writer2latex/util/SimpleXMLParser.java
+++ b/source/java/writer2latex/util/SimpleXMLParser.java
@@ -28,6 +28,7 @@ package writer2latex.util;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringReader;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
@@ -35,6 +36,7 @@ import javax.xml.parsers.SAXParserFactory;
 
 import org.w3c.dom.Document;
 import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -53,6 +55,8 @@ public class SimpleXMLParser extends DefaultHandler {
 	 */
 	public static Document parse(InputStream is) throws IOException, SAXException {
 		SAXParserFactory factory=SAXParserFactory.newInstance();
+		
+		factory.setValidating(false);
 		SimpleXMLParser handler = new SimpleXMLParser();
 		try {
 			SAXParser saxParser = factory.newSAXParser();
@@ -71,7 +75,13 @@ public class SimpleXMLParser extends DefaultHandler {
 	public org.w3c.dom.Document getDOM() {
 		return builder.getDOM();
 	}
-		
+	
+	// We don't need - and in fact should avoid - any external entities
+	@Override public InputSource resolveEntity(String publicID, String systemID) throws SAXException {
+		System.out.println("resolveEntity "+publicID+" "+systemID);
+		return new InputSource(new StringReader(""));
+	}
+	
 	@Override public void startElement(String nameSpace, String localName, String qName, Attributes attributes){
 		builder.startElement(qName);
 		int nLen = attributes.getLength();
diff --git a/source/java/writer2latex/xhtml/DrawConverter.java b/source/java/writer2latex/xhtml/DrawConverter.java
index 44dc394..e759be9 100644
--- a/source/java/writer2latex/xhtml/DrawConverter.java
+++ b/source/java/writer2latex/xhtml/DrawConverter.java
@@ -491,12 +491,20 @@ public class DrawConverter extends ConverterHelper {
         	byte[] blob = bgd.getData();
         	try {
 				Document dom = SimpleXMLParser.parse(new ByteArrayInputStream(blob));
-				Element elm = hnodeInline!=null ? hnodeInline : hnodeBlock;
-				imageElement = (Element) elm.getOwnerDocument().importNode(dom.getDocumentElement(), true);
+				if (dom!=null) {
+					Element elm = hnodeInline!=null ? hnodeInline : hnodeBlock;
+					imageElement = (Element) elm.getOwnerDocument().importNode(dom.getDocumentElement(), true);
+				}
+				else {
+					System.out.println("Failed to parse SVG");
+				}
 			} catch (IOException e) {
 				// Will not happen with a byte array
+				System.out.println("IOException parsing SVG");
+				e.printStackTrace();
 			} catch (SAXException e) {
 				e.printStackTrace();
+				System.out.println("SAXException parsing SVG");
 			}
         }
         else {
@@ -517,17 +525,19 @@ public class DrawConverter extends ConverterHelper {
         	imageElement = image;
         }
         
-    	// Now style it
-    	StyleInfo info = new StyleInfo();
-    	String sStyleName = Misc.getAttribute(frame, XMLString.DRAW_STYLE_NAME);
-    	if (nMode!=FULL_SCREEN) { getFrameSc().applyStyle(sStyleName,info); }
-    	applyImageSize(frame,info.props,nMode,false);
+        if (imageElement!=null) {
+        	// Now style it
+        	StyleInfo info = new StyleInfo();
+        	String sStyleName = Misc.getAttribute(frame, XMLString.DRAW_STYLE_NAME);
+        	if (nMode!=FULL_SCREEN) { getFrameSc().applyStyle(sStyleName,info); }
+        	applyImageSize(frame,info.props,nMode,false);
 
-    	// Apply placement
-    	applyPlacement(frame, hnodeBlock, hnodeInline, nMode, imageElement, info);
+        	// Apply placement
+        	applyPlacement(frame, hnodeBlock, hnodeInline, nMode, imageElement, info);
 
-    	applyStyle(info,imageElement);
-    	addLink(onode,imageElement);
+        	applyStyle(info,imageElement);
+        	addLink(onode,imageElement);
+        }
     }
 
     private void handleDrawTextBox(Element onode, Element hnodeBlock, Element hnodeInline, int nMode) {