diff --git a/src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java b/src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java
index e444ce81..c5fdf4c3 100644
--- a/src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java
+++ b/src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java
@@ -87,7 +87,7 @@ public class ClientHttpRequestFactoryService {
 
         log.info("Initialize ClientHttpRequestFactory with insecure ClientHttpRequestFactory for development");
 
-        if (proxy.proxyAuthType != null && proxy.proxyAuthType != ProxyAuthType.NONE) {
+        if (proxy != null && proxy.proxyAuthType != null && proxy.proxyAuthType != ProxyAuthType.NONE) {
 
             log.info("Initialize ClientHttpRequestFactory with proxy auth: {} : {}",
                     proxy.proxyAuthType,