diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/filetransformer/DescriptionTemplateDefinitionFileTransformerBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/filetransformer/DescriptionTemplateDefinitionFileTransformerBuilder.java
index f31135094..cf0463d02 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/filetransformer/DescriptionTemplateDefinitionFileTransformerBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/filetransformer/DescriptionTemplateDefinitionFileTransformerBuilder.java
@@ -229,7 +229,9 @@ public class DescriptionTemplateDefinitionFileTransformerBuilder extends BaseFil
             m.setMethod(d.getMethod());
             m.setHasAuth(d.getHasAuth());
             m.setOptionsRoot(d.getOptionsRoot());
-            m.setAuth(convertAuthData(d.getAuth()));
+            if (d.getAuth() != null) {
+                m.setAuth(convertAuthData(d.getAuth()));
+            }
             m.setSourceBinding(convertComboBoxOption(d.getSourceBinding()));
             result.add(m);
         }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerService.java b/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerService.java
index a70090103..15d6e13d5 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerService.java
@@ -111,7 +111,6 @@ public class FileTransformerService {
             List<TransformerRepository> repositories = transformerProperties.getSources().stream().map(depositSource -> getRepository(depositSource.getCodes().get(0))).toList();
 
             repositories = new ArrayList<>(repositories);
-            List<TransformerRepository> toDelete = new ArrayList<>();
             repositories.forEach((client) -> {
                 try {
                     FileTransformerConfiguration repositoryConfigs = client.getConfiguration();
@@ -119,12 +118,10 @@ public class FileTransformerService {
                         configurations.addAll(repositoryConfigs.getExportVariants());
                     }
                 } catch (Exception e) {
-                    toDelete.add(client);
+                    logger.warn(e.getLocalizedMessage(), e);
                 }
             });
 
-            repositories.removeAll(toDelete);
-
             configs = new TransformerCacheModel(configurations);
             this.fileTransformerConfigurationCache.put("base", configs);
         }