diff --git a/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java b/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
index c103a40678..c55d936ae5 100644
--- a/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
+++ b/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
@@ -417,7 +417,7 @@ public class PropertyIDMap implements Map<Long,String> {
     /**
      * Creates a {@link PropertyIDMap} backed by another map.
      *
-     * @param map The instance to be created is backed by this map.
+     * @param idValues an array of key/value pairs via nested Object[2] arrays
      */
     private PropertyIDMap(Object[][] idValues) {
         Map<Long,String> m = new HashMap<>(idValues.length);
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
index 65d23f01c8..c561499d78 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
@@ -550,10 +550,7 @@ public class XSSFCellStyle implements CellStyle {
      */
     @Override
     public boolean getHidden() {
-        if (!_cellXf.isSetProtection() || !_cellXf.getProtection().isSetHidden()) {
-            return false;
-        }
-        return _cellXf.getProtection().getHidden();
+        return _cellXf.isSetProtection() && _cellXf.getProtection().isSetHidden() && _cellXf.getProtection().getHidden();
     }
 
     /**
@@ -622,10 +619,7 @@ public class XSSFCellStyle implements CellStyle {
      */
     @Override
     public boolean getLocked() {
-        if (!_cellXf.isSetProtection() || !_cellXf.getProtection().isSetLocked()) {
-            return true;
-        }
-        return _cellXf.getProtection().getLocked();
+        return !_cellXf.isSetProtection() || !_cellXf.getProtection().isSetLocked() || _cellXf.getProtection().getLocked();
     }
 
     /**