diff --git a/domismp-tests/domismp-docker/functions/run-test.functions b/domismp-tests/domismp-docker/functions/run-test.functions
index 0692d60bf2997c3a2cfc08cb52310b1d769fe12c..0c9d2b9e3bbfc98aef2536c1391e74975eed4494 100644
--- a/domismp-tests/domismp-docker/functions/run-test.functions
+++ b/domismp-tests/domismp-docker/functions/run-test.functions
@@ -27,9 +27,9 @@ function initializeVariables() {
 # Function exports the logs to file and stop and clear containers
 function stopAndClearTestContainers() {
   echo "Save docker log to docker-file"
-  docker logs "${PLAN_PREFIX}" > smp-container.log 2>&1
+  docker compose -p "${PLAN_PREFIX}" logs > smp-containers.log 2>&1
   echo "Clear containers and volumes"
-  docker-compose -p "${PLAN_PREFIX}" rm -s -f -v
+  docker compose -p "${PLAN_PREFIX}" rm -s -f -v
 }
 
 ################################################################
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java
index 29e01b44638aac1ad56e64d141d2296b17ce48e1..4eb543da86da468ba90b8610e31a041c7bb73518 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java
@@ -146,7 +146,7 @@ public final class DomUtils {
     protected static void setConfigurationOption(TransformerFactory factory, String feature, boolean value) {
         try {
             factory.setFeature(feature, value);
-        } catch (TransformerConfigurationException e) {
+        } catch (UnsupportedOperationException | TransformerConfigurationException e) {
             LOG.warn("TransformerFactory initialization error. The feature [{}] is not supported by current factory. The feature is ignored.", feature);
         }
     }