diff --git a/nima/http/media/jackson/src/main/java/io/helidon/nima/http/media/jackson/JacksonSupport.java b/nima/http/media/jackson/src/main/java/io/helidon/nima/http/media/jackson/JacksonSupport.java
index 1fbbf062c25..d6640529d55 100644
--- a/nima/http/media/jackson/src/main/java/io/helidon/nima/http/media/jackson/JacksonSupport.java
+++ b/nima/http/media/jackson/src/main/java/io/helidon/nima/http/media/jackson/JacksonSupport.java
@@ -72,6 +72,9 @@ public static MediaSupport create(Config config) {
      * @return a new {@link JacksonSupport}
      */
     public static MediaSupport create(Config config, String name) {
+        Objects.requireNonNull(config);
+        Objects.requireNonNull(name);
+
         ObjectMapper objectMapper = new ObjectMapper()
                 .registerModule(new ParameterNamesModule())
                 .registerModule(new Jdk8Module())
diff --git a/nima/http/media/jsonb/src/main/java/io/helidon/nima/http/media/jsonb/JsonbSupport.java b/nima/http/media/jsonb/src/main/java/io/helidon/nima/http/media/jsonb/JsonbSupport.java
index 99af5dead88..4fff88d0393 100644
--- a/nima/http/media/jsonb/src/main/java/io/helidon/nima/http/media/jsonb/JsonbSupport.java
+++ b/nima/http/media/jsonb/src/main/java/io/helidon/nima/http/media/jsonb/JsonbSupport.java
@@ -16,6 +16,8 @@
 
 package io.helidon.nima.http.media.jsonb;
 
+import java.util.Objects;
+
 import io.helidon.common.GenericType;
 import io.helidon.common.config.Config;
 import io.helidon.common.http.Headers;
@@ -69,6 +71,9 @@ public static MediaSupport create(Config config) {
      * @see #create(io.helidon.common.config.Config)
      */
     public static MediaSupport create(Config config, String name) {
+        Objects.requireNonNull(config);
+        Objects.requireNonNull(name);
+
         return new JsonbSupport(name);
     }
 
diff --git a/nima/http/media/media/src/main/java/io/helidon/nima/http/media/PathSupport.java b/nima/http/media/media/src/main/java/io/helidon/nima/http/media/PathSupport.java
index cde98ca1ad2..64bb452bd8b 100644
--- a/nima/http/media/media/src/main/java/io/helidon/nima/http/media/PathSupport.java
+++ b/nima/http/media/media/src/main/java/io/helidon/nima/http/media/PathSupport.java
@@ -22,6 +22,7 @@
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Objects;
 
 import io.helidon.common.GenericType;
 import io.helidon.common.http.ContentDisposition;
@@ -47,7 +48,7 @@ public class PathSupport implements MediaSupport {
      * @param name name of this instance
      */
     protected PathSupport(String name) {
-        this.name = name;
+        this.name = Objects.requireNonNull(name);
     }
 
     /**
diff --git a/nima/http/media/media/src/main/java/io/helidon/nima/http/media/StringSupport.java b/nima/http/media/media/src/main/java/io/helidon/nima/http/media/StringSupport.java
index 34c4661d87d..15460ec2e68 100644
--- a/nima/http/media/media/src/main/java/io/helidon/nima/http/media/StringSupport.java
+++ b/nima/http/media/media/src/main/java/io/helidon/nima/http/media/StringSupport.java
@@ -22,6 +22,7 @@
 import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 import java.util.Optional;
 
 import io.helidon.common.GenericType;
@@ -50,7 +51,7 @@ public class StringSupport implements MediaSupport {
      * @param name name of this instance
      */
     protected StringSupport(String name) {
-        this.name = name;
+        this.name = Objects.requireNonNull(name);
     }
 
     /**
diff --git a/nima/http/media/multipart/src/main/java/io/helidon/nima/http/media/multipart/MultiPartSupport.java b/nima/http/media/multipart/src/main/java/io/helidon/nima/http/media/multipart/MultiPartSupport.java
index c65cbc09926..b189c7f813c 100644
--- a/nima/http/media/multipart/src/main/java/io/helidon/nima/http/media/multipart/MultiPartSupport.java
+++ b/nima/http/media/multipart/src/main/java/io/helidon/nima/http/media/multipart/MultiPartSupport.java
@@ -17,6 +17,7 @@
 package io.helidon.nima.http.media.multipart;
 
 import java.lang.System.Logger.Level;
+import java.util.Objects;
 import java.util.Optional;
 
 import io.helidon.common.GenericType;
@@ -48,7 +49,7 @@ public class MultiPartSupport implements MediaSupport {
     private MediaContext context;
 
     private MultiPartSupport(String name) {
-        this.name = name;
+        this.name = Objects.requireNonNull(name);
     }
 
     /**
diff --git a/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ProtocolConfigs.java b/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ProtocolConfigs.java
index 4a981633497..2fd554831df 100644
--- a/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ProtocolConfigs.java
+++ b/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ProtocolConfigs.java
@@ -17,6 +17,7 @@
 package io.helidon.nima.webserver;
 
 import java.util.List;
+import java.util.Objects;
 
 import io.helidon.nima.webserver.spi.ProtocolConfig;
 
@@ -37,6 +38,7 @@ private ProtocolConfigs(List<ProtocolConfig> protocolConfigs) {
      * @return protocol configuration handler
      */
     public static ProtocolConfigs create(List<ProtocolConfig> protocolConfigs) {
+        Objects.requireNonNull(protocolConfigs);
         return new ProtocolConfigs(protocolConfigs);
     }
 
@@ -53,6 +55,9 @@ public static ProtocolConfigs create(List<ProtocolConfig> protocolConfigs) {
      */
     public <T extends ProtocolConfig> List<T> config(String protocolType,
                                                      Class<T> protocolConfigType) {
+        Objects.requireNonNull(protocolType);
+        Objects.requireNonNull(protocolConfigType);
+
         return protocolConfigs.stream()
                 .filter(it -> protocolType.equals(it.type()))
                 .filter(it -> protocolConfigType.isAssignableFrom(it.getClass()))
diff --git a/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ServerConfigBlueprint.java b/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ServerConfigBlueprint.java
index dc4a700a2e9..a2e3978108d 100644
--- a/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ServerConfigBlueprint.java
+++ b/nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/ServerConfigBlueprint.java
@@ -67,7 +67,7 @@ class ServerConfigInterceptor implements Prototype.BuilderInterceptor<ServerConf
         public ServerConfig.BuilderBase<?, ?> intercept(ServerConfig.BuilderBase<?, ?> target) {
             if (target.sockets().containsKey(WebServer.DEFAULT_SOCKET_NAME)) {
                 throw new ConfigException("Default socket must be configured directly on server config node, or through"
-                                                  + " ServerConfig.Builder, not as a separated socket.");
+                                                  + " \"ServerConfig.Builder\", not as a separated socket.");
             }
 
             return target;