diff --git a/newsfragments/387.bugfix.rst b/newsfragments/387.bugfix.rst
new file mode 100644
index 00000000..0ba3f07c
--- /dev/null
+++ b/newsfragments/387.bugfix.rst
@@ -0,0 +1 @@
+Store peer ids in ``set`` instead of ``list`` and check if peer id exists in ``dict`` before accessing to prevent ``KeyError``.
\ No newline at end of file