diff --git a/Kitodo/src/main/java/org/kitodo/production/ldap/LdapUser.java b/Kitodo/src/main/java/org/kitodo/production/ldap/LdapUser.java
index 1990e10774e..a9aad2e65dd 100644
--- a/Kitodo/src/main/java/org/kitodo/production/ldap/LdapUser.java
+++ b/Kitodo/src/main/java/org/kitodo/production/ldap/LdapUser.java
@@ -44,6 +44,7 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bouncycastle.crypto.digests.MD4Digest;
@@ -278,7 +279,7 @@ public static String toHexString(byte[] bytes) {
 
     @Override
     public Attributes getAttributes(String name) throws NamingException {
-        if (!name.isEmpty()) {
+        if (StringUtils.isBlank(name)) {
             throw new NameNotFoundException();
         }
         return (Attributes) this.attributes.clone();
@@ -291,7 +292,7 @@ public Attributes getAttributes(Name name) throws NamingException {
 
     @Override
     public Attributes getAttributes(String name, String[] ids) throws NamingException {
-        if (!name.isEmpty()) {
+        if (StringUtils.isBlank(name)) {
             throw new NameNotFoundException();
         }
 
diff --git a/Kitodo/src/main/java/org/kitodo/production/services/file/FileService.java b/Kitodo/src/main/java/org/kitodo/production/services/file/FileService.java
index 3b1fce697db..657f46d50dd 100644
--- a/Kitodo/src/main/java/org/kitodo/production/services/file/FileService.java
+++ b/Kitodo/src/main/java/org/kitodo/production/services/file/FileService.java
@@ -1183,14 +1183,14 @@ private List<String> getCanonicalFileNamePartsAndSanitizeAbsoluteURIs(Workpiece
                     physicalDivision.getMediaFiles().put(entry.getKey(), mediaFile);
                 }
                 String fileCanonical = subfolder.getCanonical(mediaFile);
-                if (unitCanonical.isEmpty()) {
+                if (StringUtils.isBlank(unitCanonical)) {
                     unitCanonical = fileCanonical;
                 } else if (!unitCanonical.equals(fileCanonical)) {
                     throw new InvalidImagesException("Ambiguous canonical file name part in the same physical division: \""
                             + unitCanonical + "\" and \"" + fileCanonical + "\"!");
                 }
             }
-            if (!physicalDivision.getMediaFiles().isEmpty() && unitCanonical.isEmpty()) {
+            if (!physicalDivision.getMediaFiles().isEmpty() && StringUtils.isBlank(unitCanonical)) {
                 throw new InvalidImagesException("Missing canonical file name part in physical division " + physicalDivision);
             }
             canonicals.add(unitCanonical);
diff --git a/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java b/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java
index ac3a02592e7..547614e0f51 100644
--- a/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java
+++ b/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java
@@ -33,6 +33,7 @@
 import javax.json.JsonReader;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.kitodo.config.ConfigCore;
@@ -426,7 +427,7 @@ public int getProgress(ObjectType currentType, PushContext pollingChannel) throw
     public String createMapping() throws IOException, CustomResponseException {
         for (String mappingType : KitodoRestClient.MAPPING_TYPES) {
             String mapping = readMapping(mappingType);
-            if (mapping.isEmpty()) {
+            if (StringUtils.isBlank(mapping)) {
                 if (indexRestClient.createIndex(null, mappingType)) {
                     currentState = IndexStates.CREATING_MAPPING_SUCCESSFUL;
                 } else {