diff --git a/pdf/src/plugin-resources/fo-cover.xslt b/pdf/src/plugin-resources/fo-cover.xslt
index 81b8147d..edd2a861 100644
--- a/pdf/src/plugin-resources/fo-cover.xslt
+++ b/pdf/src/plugin-resources/fo-cover.xslt
@@ -35,6 +35,7 @@
                         <fo:table-body>
                             <fo:table-row height="{$headerHeight}in">
                                 <fo:table-cell>
+                                    <xsl:if test="normalize-space($companyLogo) != ''">
                                     <fo:block text-align="left" vertical-align="top">
                                         <xsl:variable name="source">
                                             <xsl:choose>
@@ -51,15 +52,17 @@
                                         </xsl:variable>
                                         <fo:external-graphic src="{$source}" height="{$headerHeight}in" width="auto" content-height="{$headerHeight}in" content-width="auto"/>
                                     </fo:block>
+                                    </xsl:if>
                                 </fo:table-cell>
                                 <fo:table-cell>
+                                    <xsl:if test="normalize-space($projectLogo) != ''">
                                     <fo:block text-align="right" vertical-align="top">
                                         <xsl:variable name="source">
                                             <xsl:choose>
                                                 <xsl:when test="substring(normalize-space($projectLogo),1,3) = '../'">
                                                     <xsl:value-of select="translate(substring-after(normalize-space($projectLogo),'../'),'\','/')"/>
                                                 </xsl:when>
-                                                <xsl:when test="substring(normalize-space($companyLogo),1,3) = '..\'">
+                                                <xsl:when test="substring(normalize-space($projectLogo),1,3) = '..\'">
                                                     <xsl:value-of select="translate(substring-after(normalize-space($projectLogo),'..\'),'\','/')"/>
                                                 </xsl:when>
                                                 <xsl:otherwise>
@@ -69,6 +72,7 @@
                                         </xsl:variable>
                                         <fo:external-graphic src="{$source}" height="{$headerHeight}in" width="auto" content-height="{$headerHeight}in" content-width="auto"/>
                                     </fo:block>
+                                    </xsl:if>
                                 </fo:table-cell>
                             </fo:table-row>
                             <fo:table-row keep-with-previous="always" height="{$lineHeight}in">
diff --git a/pdf/xdocs/changes.xml b/pdf/xdocs/changes.xml
index cdcc7295..d6b9e66c 100644
--- a/pdf/xdocs/changes.xml
+++ b/pdf/xdocs/changes.xml
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="2.3.1-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="fix" issue="MPPDF-42" due-to="Lukas Theussl">Error when logo locations are not set.</action>
       <action dev="aheritier" type="fix" issue="MPPDF-41" due-to="Lukas Theussl">Suppress verbose output by default.</action>
       <action dev="aheritier" type="fix" issue="MPPDF-39" due-to="Lukas Theussl">Missing patch for MPPDF-24 ( it defines a missing attribute for &lt;code style="indent"&gt; tags and cleans up some layout issues with definition lists).</action>
       <action dev="aheritier" type="fix" issue="MPPDF-35" due-to="Lukas Theussl">Standardize copyright notices.</action>