diff --git a/libtransmission/net.cc b/libtransmission/net.cc
index bdef4b197..96866d9a1 100644
--- a/libtransmission/net.cc
+++ b/libtransmission/net.cc
@@ -447,6 +447,7 @@ namespace global_ipv6_helpers
             {
                 if (auto const addrport = tr_address::from_sockaddr(reinterpret_cast<sockaddr*>(&src_ss)); addrport)
                 {
+                    evutil_closesocket(sock);
                     errno = save;
                     return addrport->first;
                 }
diff --git a/tests/libtransmission/file-test.cc b/tests/libtransmission/file-test.cc
index fcd515a77..d4c3aa74d 100644
--- a/tests/libtransmission/file-test.cc
+++ b/tests/libtransmission/file-test.cc
@@ -225,7 +225,7 @@ TEST_F(FileTest, getInfo)
     // Can't get info of non-existent file/directory
     tr_error* err = nullptr;
     auto info = tr_sys_path_get_info(path1, 0, &err);
-    ASSERT_FALSE(info.has_value());
+    EXPECT_FALSE(info.has_value());
     EXPECT_NE(nullptr, err);
     tr_error_clear(&err);