diff --git a/coap-core/src/main/java/com/mbed/coap/server/CoapServerBuilder.java b/coap-core/src/main/java/com/mbed/coap/server/CoapServerBuilder.java
index bf0633b2..38134387 100644
--- a/coap-core/src/main/java/com/mbed/coap/server/CoapServerBuilder.java
+++ b/coap-core/src/main/java/com/mbed/coap/server/CoapServerBuilder.java
@@ -84,7 +84,7 @@ public final class CoapServerBuilder {
     private NotificationsReceiver notificationsReceiver = NotificationsReceiver.REJECT_ALL;
     private ObservationsStore observationStore = ObservationsStore.ALWAYS_EMPTY;
     private RequestTagSupplier requestTagSupplier = RequestTagSupplier.createSequential();
-    private Boolean isTransportLoggingEnabled = true;
+    private boolean isTransportLoggingEnabled = true;
 
     CoapServerBuilder() {
     }
@@ -223,8 +223,8 @@ public CoapServerBuilder requestTagSupplier(RequestTagSupplier requestTagSupplie
         return this;
     }
 
-    public CoapServerBuilder transportLogging(Boolean transportLogging) {
-        this.isTransportLoggingEnabled = requireNonNull(transportLogging);
+    public CoapServerBuilder transportLogging(boolean isTransportLoggingEnabled) {
+        this.isTransportLoggingEnabled = isTransportLoggingEnabled;
         return this;
     }
 
diff --git a/coap-core/src/main/java/com/mbed/coap/transport/CoapTransport.java b/coap-core/src/main/java/com/mbed/coap/transport/CoapTransport.java
index 719dd8dd..66707b8c 100644
--- a/coap-core/src/main/java/com/mbed/coap/transport/CoapTransport.java
+++ b/coap-core/src/main/java/com/mbed/coap/transport/CoapTransport.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.