diff --git a/pom.xml b/pom.xml
index c14147c..e8b5eac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.kttdevelopment</groupId>
     <artifactId>simplehttpserver</artifactId>
-    <version>03.04.02</version>
+    <version>03.04.03</version>
     <packaging>jar</packaging>
 
     <url>https://github.com/Ktt-Development/simplehttpserver</url>
diff --git a/src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpServerImpl.java b/src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpServerImpl.java
index 9e380cf..7bf5b18 100644
--- a/src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpServerImpl.java
+++ b/src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpServerImpl.java
@@ -13,7 +13,7 @@
  *
  * @see SimpleHttpServer
  * @since 02.00.00
- * @version 03.04.00
+ * @version 03.04.03
  * @author Ktt Development
  */
 @SuppressWarnings("SpellCheckingInspection")
@@ -130,11 +130,23 @@ public final HttpSession getHttpSession(final SimpleHttpExchange exchange){
 
     @Override
     public synchronized final HttpContext createContext(final String path){
-        return createContext(path,(HttpExchange exchange) -> {});
+        return createContext(path,HttpExchange::close,null);
     }
 
     @Override
     public synchronized final HttpContext createContext(final String path, final HttpHandler handler){
+        return createContext(path,handler,null);
+    }
+
+    //
+
+    @Override
+    public synchronized final HttpContext createContext(final String path, final Authenticator authenticator){
+        return createContext(path,HttpExchange::close,authenticator);
+    }
+
+    @Override
+    public synchronized final HttpContext createContext(final String path, final HttpHandler handler, final Authenticator authenticator){
         if(!getContext(path).equals("/") && handler instanceof RootHandler)
             throw new IllegalArgumentException("RootHandler can only be used at the root '/' context");
 
@@ -142,26 +154,13 @@ public synchronized final HttpContext createContext(final String path, final Htt
             handle(exchange);
             handler.handle(exchange);
         };
-        final HttpContext context = server.createContext(getContext(path),wrapper);
 
+        final HttpContext context = server.createContext(getContext(path),wrapper);
         contexts.put(context,handler);
 
-        return context;
-    }
-
-    //
+        if(authenticator != null)
+            context.setAuthenticator(authenticator);
 
-    @Override
-    public synchronized final HttpContext createContext(final String path, final Authenticator authenticator){
-        final HttpContext context = createContext(path);
-        context.setAuthenticator(authenticator);
-        return context;
-    }
-
-    @Override
-    public synchronized final HttpContext createContext(final String path, final HttpHandler handler, final Authenticator authenticator){
-        final HttpContext context = createContext(path,handler);
-        context.setAuthenticator(authenticator);
         return context;
     }
 
diff --git a/src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpsServerImpl.java b/src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpsServerImpl.java
index e3975f5..c683274 100644
--- a/src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpsServerImpl.java
+++ b/src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpsServerImpl.java
@@ -13,7 +13,7 @@
  *
  * @see SimpleHttpsServer
  * @since 03.04.00
- * @version 03.04.02
+ * @version 03.04.03
  * @author Ktt Development
  */
 final class SimpleHttpsServerImpl extends SimpleHttpsServer {
@@ -143,13 +143,25 @@ public final HttpSession getHttpSession(final SimpleHttpExchange exchange){
 
     //
 
-    @Override
+@Override
     public synchronized final HttpContext createContext(final String path){
-        return createContext(path,(HttpExchange exchange) -> {});
+        return createContext(path,HttpExchange::close,null);
     }
 
     @Override
     public synchronized final HttpContext createContext(final String path, final HttpHandler handler){
+        return createContext(path,handler,null);
+    }
+
+    //
+
+    @Override
+    public synchronized final HttpContext createContext(final String path, final Authenticator authenticator){
+        return createContext(path,HttpExchange::close,authenticator);
+    }
+
+    @Override
+    public synchronized final HttpContext createContext(final String path, final HttpHandler handler, final Authenticator authenticator){
         if(!getContext(path).equals("/") && handler instanceof RootHandler)
             throw new IllegalArgumentException("RootHandler can only be used at the root '/' context");
 
@@ -157,26 +169,13 @@ public synchronized final HttpContext createContext(final String path, final Htt
             handle(exchange);
             handler.handle(exchange);
         };
-        final HttpContext context = server.createContext(getContext(path),wrapper);
 
+        final HttpContext context = server.createContext(getContext(path),wrapper);
         contexts.put(context,handler);
 
-        return context;
-    }
-
-    //
-
-    @Override
-    public synchronized final HttpContext createContext(final String path, final Authenticator authenticator){
-        final HttpContext context = createContext(path);
-        context.setAuthenticator(authenticator);
-        return context;
-    }
+        if(authenticator != null)
+            context.setAuthenticator(authenticator);
 
-    @Override
-    public synchronized final HttpContext createContext(final String path, final HttpHandler handler, final Authenticator authenticator){
-        final HttpContext context = createContext(path,handler);
-        context.setAuthenticator(authenticator);
         return context;
     }