diff --git a/lib/fop.jar b/lib/fop.jar
index bb2e71f..7398768 100644
--- a/lib/fop.jar
+++ b/lib/fop.jar
Binary files differ
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java b/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
index 076aa4f..cbb5930 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
@@ -107,6 +107,7 @@
         if (targetPage.getPDFResources().getParentResources() == null) {
             PDFResources res = pdfDoc.getFactory().makeResources();
             res.setParentResources(pdfDoc.getResources());
+            res.addContext(targetPage);
             targetPage.put("Resources", res);
         }
 
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java b/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
index cf4596b..725b468 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
@@ -1215,6 +1215,8 @@
                 s.append("<<");
                 readPDFArguments(op, dictArgs);
                 s.append(">>");
+            } else if (c instanceof COSBoolean) {
+                s.append(((COSBoolean) c).getValue());
             } else {
                 throw new IOException(c + " not supported");
             }
@@ -1382,6 +1384,9 @@
         PDResources sourcePageResources = page.findResources();
         PDFDictionary pageResources = null;
         PDStream pdStream = page.getContents();
+        if (pdStream == null) {
+            return "";
+        }
         COSDictionary fonts = (COSDictionary)sourcePageResources.getCOSDictionary().getDictionaryObject(COSName.FONT);
         COSDictionary fontsBackup = null;
         String uniqueName = Integer.toString(key.hashCode());