diff --git a/UI/org.eclipse.birt.report.designer.core/src/org/eclipse/birt/report/designer/util/ImageManager.java b/UI/org.eclipse.birt.report.designer.core/src/org/eclipse/birt/report/designer/util/ImageManager.java
index e116209adb..aa36676537 100644
--- a/UI/org.eclipse.birt.report.designer.core/src/org/eclipse/birt/report/designer/util/ImageManager.java
+++ b/UI/org.eclipse.birt.report.designer.core/src/org/eclipse/birt/report/designer/util/ImageManager.java
@@ -183,7 +183,8 @@ public Image getEmbeddedImage(ModuleHandle handle, String name) {
 		InputStream in = null;
 		try {
 			if (key.toLowerCase().endsWith(".svg") //$NON-NLS-1$
-					|| embeddedImage.getType(handle.getModule()).equalsIgnoreCase("image/svg+xml"))
+					|| embeddedImage.getType(handle.getModule()) != null
+							&& embeddedImage.getType(handle.getModule()).equalsIgnoreCase(URL_IMAGE_TYPE_SVG))
 			{
 				// convert svg image to JPEG image bytes
 				JPEGTranscoder jpegTranscoder = new JPEGTranscoder();
diff --git a/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/AbstractEmitterImpl.java b/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/AbstractEmitterImpl.java
index 6ed2174486..22805cd455 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/AbstractEmitterImpl.java
+++ b/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/AbstractEmitterImpl.java
@@ -1067,10 +1067,10 @@ public void startImage(IImageContent image) {
 				referenceHeight = imageInfo.getHeight();
 				height = WordUtil.convertImageSize(image.getHeight(), referenceHeight, PropertyUtil.getImageDpi(image, imageFileHeightDpi, 0));
 			}
-			if (image.getWidth() == null && height > 0) {
+			if (image.getWidth() == null && width == 0 && height > 0) {
 				width = height;
 			}
-			if (width > 0 && image.getHeight() == null) {
+			if (width > 0 && image.getHeight() == null && height == 0) {
 				height = width;
 			}
 
@@ -1385,7 +1385,6 @@ private void writeHeaderFooter() throws IOException, BirtException {
 		String backgroundWidth = style.getBackgroundWidth();
 
 		SimpleMasterPageDesign master = (SimpleMasterPageDesign) previousPage.getGenerateBy();
-
 		if (previousPage.getPageHeader() != null || backgroundHeight != null || backgroundWidth != null) {
 			wordWriter.startHeader(!master.isShowHeaderOnFirst() && previousPage.getPageNumber() == 1, headerHeight,
 					contentWidth);