stackify
diff --git a/‎src/main/java/com/stackify/api/common/http/HttpClient.java‎
Lines changed: 4 additions & 4 deletions b/‎src/main/java/com/stackify/api/common/http/HttpClient.java‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/main/java/com/stackify/api/common/http/HttpProxy.java‎
Lines changed: 8 additions & 17 deletions b/‎src/main/java/com/stackify/api/common/http/HttpProxy.java‎
Lines changed: 8 additions & 17 deletions
@@ -60,15 +60,15 @@ public class HttpClient {
 	 * Constructor
 	 * @param apiConfig API configuration
 	 */
-	public HttpClient(final ApiConfiguration apiConfig) {
-		Preconditions.checkNotNull(apiConfig);
-		this.apiConfig = apiConfig;
+    public HttpClient(final ApiConfiguration apiConfig) {
+        Preconditions.checkNotNull(apiConfig);
+        this.apiConfig = apiConfig;
 
         if (apiConfig.getHttpProxyHost() != null &&
                 !apiConfig.getHttpProxyHost().isEmpty() &&
                 apiConfig.getHttpProxyPort() != null &&
                 !apiConfig.getHttpProxyPort().isEmpty()) {
-            this.proxy = HttpProxy.build(apiConfig.getHttpProxyHost(), Integer.parseInt(apiConfig.getHttpProxyPort()));
+            this.proxy = HttpProxy.build(apiConfig.getHttpProxyHost(), apiConfig.getHttpProxyPort());
         } else {
             this.proxy = HttpProxy.fromSystemProperties();
         }
 
@@ -15,7 +15,6 @@
  */
 package com.stackify.api.common.http;
 
-import lombok.NonNull;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
@@ -35,26 +34,18 @@ public class HttpProxy {
      * @return Proxy from system settings
      */
     public static Proxy fromSystemProperties() {
-
-        try {
-            String proxyHost = System.getProperty("https.proxyHost");
-            String proxyPort = System.getProperty("https.proxyPort");
-
-            return build(proxyHost, Integer.parseInt(proxyPort));
-
-        } catch (Throwable t) {
-            log.info("Unable to read HTTP proxy information from system properties", t);
-        }
-
-        return Proxy.NO_PROXY;
+        return build(System.getProperty("https.proxyHost"), System.getProperty("https.proxyPort"));
     }
 
-    public static Proxy build(@NonNull final String httpProxyHost,
-                              @NonNull final int httpProxyPort) {
+    public static Proxy build(final String httpProxyHost,
+                              final String httpProxyPort) {
 
         try {
-            if (!httpProxyHost.isEmpty()) {
-                return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(httpProxyHost, httpProxyPort));
+            if (httpProxyHost != null &&
+                    !httpProxyHost.isEmpty() &&
+                    httpProxyPort != null &&
+                    !httpProxyPort.isEmpty()) {
+                return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(httpProxyHost, Integer.parseInt(httpProxyPort)));
             }
         } catch (Throwable t) {
             log.info("Unable to read HTTP proxy information from system properties", t);