diff --git a/lib/Listener.cpp b/lib/Listener.cpp
index ef96522..f24f459 100644
--- a/lib/Listener.cpp
+++ b/lib/Listener.cpp
@@ -91,13 +91,13 @@ void Listener::stop() {
 
 std::unique_ptr<Endpoint> Listener::accept() {
   std::unique_lock lk{m_queueLock};
-  if (m_endpointQueue.size()) {
-    std::unique_ptr<Endpoint> ret;
-    ret = std::move(m_endpointQueue.front());
-    m_endpointQueue.pop();
-    return ret;
+  if (m_endpointQueue.empty()) {
+    return nullptr;
   }
-  return {};
+
+  auto ret = std::move(m_endpointQueue.front());
+  m_endpointQueue.pop();
+  return ret;
 }
 
 Listener::Listener() = default;