diff --git a/arch/ua_network_tcp.c b/arch/ua_network_tcp.c
index 4ee317b39..51e7d8625 100644
--- a/arch/ua_network_tcp.c
+++ b/arch/ua_network_tcp.c
@@ -525,20 +525,22 @@ UA_ServerNetworkLayer
 UA_ServerNetworkLayerTCP(UA_ConnectionConfig config, UA_UInt16 port, UA_Logger logger) {
     UA_ServerNetworkLayer nl;
     memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
+    nl.deleteMembers = ServerNetworkLayerTCP_deleteMembers;
+    nl.localConnectionConfig = config;
+    nl.start = ServerNetworkLayerTCP_start;
+    nl.listen = ServerNetworkLayerTCP_listen;
+    nl.stop = ServerNetworkLayerTCP_stop;
+    nl.handle = NULL;
+
     ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP*)
         UA_calloc(1,sizeof(ServerNetworkLayerTCP));
     if(!layer)
         return nl;
+    nl.handle = layer;
 
     layer->logger = (logger != NULL ? logger : UA_Log_Stdout);
     layer->port = port;
 
-    nl.handle = layer;
-    nl.localConnectionConfig = config;
-    nl.start = ServerNetworkLayerTCP_start;
-    nl.listen = ServerNetworkLayerTCP_listen;
-    nl.stop = ServerNetworkLayerTCP_stop;
-    nl.deleteMembers = ServerNetworkLayerTCP_deleteMembers;
     return nl;
 }
 
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index cbeec02df..4a400c1c5 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -309,19 +309,21 @@ static UA_StatusCode
 addDefaultNetworkLayers(UA_ServerConfig *conf, UA_UInt16 portNumber, UA_UInt32 sendBufferSize, UA_UInt32 recvBufferSize) {
     /* Add a network layer */
     conf->networkLayers = (UA_ServerNetworkLayer *)
         UA_malloc(sizeof(UA_ServerNetworkLayer));
     if(!conf->networkLayers)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     UA_ConnectionConfig config = UA_ConnectionConfig_default;
     if (sendBufferSize > 0)
         config.sendBufferSize = sendBufferSize;
     if (recvBufferSize > 0)
         config.recvBufferSize = recvBufferSize;
 
     conf->networkLayers[0] =
         UA_ServerNetworkLayerTCP(config, portNumber, conf->logger);
+    if (!conf->networkLayers[0].handle)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
     conf->networkLayersSize = 1;
 
     return UA_STATUSCODE_GOOD;
 }