diff --git a/src/servers/net/NetServer.cpp b/src/servers/net/NetServer.cpp
index a0c6a96599..4229ba2340 100644
--- a/src/servers/net/NetServer.cpp
+++ b/src/servers/net/NetServer.cpp
@@ -366,8 +366,8 @@ NetServer::MessageReceived(BMessage* message)
 
 		case kRegisterStatusReplicant:
 		{
-			message->FindMessenger("messenger", &fStatusMessenger);
-			_UpdateReplicantStatus();
+			if (message->FindMessenger("messenger", &fStatusMessenger) == B_OK)
+				_UpdateReplicantStatus();
 			break;
 		}
 
diff --git a/src/servers/net/StatusReplicant.cpp b/src/servers/net/StatusReplicant.cpp
index 291f889985..694755c361 100644
--- a/src/servers/net/StatusReplicant.cpp
+++ b/src/servers/net/StatusReplicant.cpp
@@ -181,11 +181,11 @@ StatusReplicant::ShowConfiguration(BMessage *message)
 	if (status != kStatusConnected && status != kStatusLinkNoConfig)
 		return;
 
-	int sock = socket(AF_INET, SOCK_DGRAM, 0);
-	if (sock < 0)
+	if (strlen(device) > IF_NAMESIZE)
 		return;
 
-	if (strlen(device) > IF_NAMESIZE)
+	int sock = socket(AF_INET, SOCK_DGRAM, 0);
+	if (sock < 0)
 		return;
 
 	ifreq request;