diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
index d47773cb2914d5d5639cdb0ef32d10d369e47774..ec162c0ff60982729c771e26e7fab9099f666344 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
@@ -187,17 +187,6 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
         return "";
     }
 
-    public boolean isCertificatePemEncoded(byte[] certData) {
-        if (certData != null && certData.length > S_PEM_START_TAG.length) {
-            for (int i = 0; i < certData.length; i++) {
-                if (certData[i] != S_PEM_START_TAG[i]) {
-                    return false;
-                }
-                return true;
-            }
-        }
-        return false;
-    }
 
     /**
      * Method tests if certificate is in PEM  format. If not it creates pem format else returns original data.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactory.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactory.java
index 67212e98b1fe9275b8a5d4dbdeac2f8f9020a7c4..0858322f72b0ac051c2ac097e1818eb1ae5191a0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactory.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactory.java
@@ -162,7 +162,9 @@ public class SmlClientFactory {
         log.info("Configuring proxy for BDMSL integration client: {}:{}@{}:{}", proxyUser, "########", proxyServer, proxyPort.get());
         httpConduit.getClient().setProxyServerType(ProxyServerType.HTTP);
         httpConduit.getClient().setProxyServer(proxyServer);
-        httpConduit.getClient().setProxyServerPort(proxyPort.get());
+        if (proxyPort.isPresent()) {
+            httpConduit.getClient().setProxyServerPort(proxyPort.get());
+        }
         ProxyAuthorizationPolicy proxyAuth = new ProxyAuthorizationPolicy();
         proxyAuth.setUserName(proxyUser);
         proxyAuth.setPassword(proxyPassword);