diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
index c275aa98d0..4019030761 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
@@ -372,8 +372,8 @@ public class XMLSlideShow extends POIXMLDocument
         }
 
         if (!themeIndexList.isEmpty()) {
-            Boolean found = false;
-            for (Integer i = 1; i <= themeIndexList.size(); i++) {
+            boolean found = false;
+            for (int i = 1; i <= themeIndexList.size(); i++) {
                 if (!themeIndexList.contains(i)) {
                     found = true;
                     themeIndex = i;
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java
index 4b9d310663..d7aed091b1 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java
@@ -153,7 +153,7 @@ public class XSLFColor {
                     colorRef = _phClr.getVal().toString();
                 }
                 // find referenced CTColor in the theme and convert it to java.awt.Color via a recursive call
-                CTColor ctColor = theme.getCTColor(colorRef);
+                CTColor ctColor = theme == null ? null : theme.getCTColor(colorRef);
                 if(ctColor != null) {
                     color = toColor(ctColor, null);
                 }