diff --git a/mDNSCore/mDNSEmbeddedAPI.h b/mDNSCore/mDNSEmbeddedAPI.h
index 34dfa14..764be3a 100644
--- a/mDNSCore/mDNSEmbeddedAPI.h
+++ b/mDNSCore/mDNSEmbeddedAPI.h
@@ -2233,7 +2233,7 @@ struct mDNS_struct
 
     DNSQuestion ReverseMap;                 // Reverse-map query to find static hostname for service target
     DNSQuestion AutomaticBrowseDomainQ;
-#if !TARGET_OS_WATCH
+#if !0
     DNSQuestion NonLocalOnlyAutomaticBrowseDomainQ;
 #endif
     domainname StaticHostname;              // Current answer to reverse-map query
diff --git a/mDNSShared/dnsextd.c b/mDNSShared/dnsextd.c
index 11a24e4..0d952e2 100644
--- a/mDNSShared/dnsextd.c
+++ b/mDNSShared/dnsextd.c
@@ -1504,7 +1504,7 @@ HandleRequest
     PktMsg buf;
     char addrbuf[32];
     TCPSocket * sock = NULL;
-    mStatus err;
+    mStatus err = 0;
     mDNSu32 lease = 0;
     mDNSBool gotlease;
     if ((request->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask) == kDNSFlag0_OP_Update)
@@ -1567,6 +1567,7 @@ HandleRequest
         res = SendPacket( sock, request );
         require_action_quiet( res >= 0, exit, err = mStatus_UnknownErr ; Log( "Couldn't relay message from %s to server.  Discarding.", inet_ntop(AF_INET, &request->src.sin_addr, addrbuf, 32 ) ) );
 
+        if (err) err = 0;
         reply = RecvPacket( sock, &buf, &closed );
     }
 
@@ -2526,7 +2527,7 @@ UDPMessageHandler
     UDPContext  *   context = ( UDPContext* ) vptr;
     PktMsg      *   reply   = NULL;
     int res;
-    mStatus err;
+    mStatus err = 0;
 
     // !!!KRS strictly speaking, we shouldn't use TCP for a UDP request because the server
     // may give us a long answer that would require truncation for UDP delivery to client
@@ -2534,6 +2535,7 @@ UDPMessageHandler
     reply = HandleRequest( context->d, &context->pkt );
     require_action( reply, exit, err = mStatus_UnknownErr );
 
+    if (err) err = 0;
     res = sendto( context->sd, &reply->msg, reply->len, 0, ( struct sockaddr* ) &context->pkt.src, sizeof( context->pkt.src ) );
     require_action_quiet( res == ( int ) reply->len, exit, LogErr( "UDPMessageHandler", "sendto" ) );