diff --git a/src/uvw/emitter.h b/src/uvw/emitter.h
index 92bf23f6..56d44704 100644
--- a/src/uvw/emitter.h
+++ b/src/uvw/emitter.h
@@ -86,10 +86,9 @@ public:
     using listener_t = std::function<void(U &, T &)>;
 
 private:
-
     template<typename U>
     auto &handler() const UVW_NOEXCEPT {
-        static_assert((std::is_same_v<U, E> || ...), "U is not a supported event type for this emitter");
+        static_assert(std::is_same_v<U, error_event> || (std::is_same_v<U, E> || ...), "U is not a supported event type for this emitter");
         return std::get<listener_t<U>>(handlers);
     }
 
@@ -102,7 +101,7 @@ private:
 protected:
     template<typename U>
     void publish(U event) {
-        if (auto& listener = handler<U>(); listener) {
+        if(auto &listener = handler<U>(); listener) {
             listener(event, *static_cast<T *>(this));
         }
     }
@@ -139,6 +138,7 @@ public:
      * @brief Disconnects all listeners.
      */
     void reset() UVW_NOEXCEPT {
+        reset<error_event>();
         (reset<E>(), ...);
     }
 
@@ -149,7 +149,7 @@ public:
      */
     template<typename U>
     bool has() const UVW_NOEXCEPT {
-        if constexpr((std::is_same_v<U, E> || ...)) {
+        if constexpr(std::is_same_v<U, error_event> || (std::is_same_v<U, E> || ...)) {
             return static_cast<bool>(handler<U>());
         } else {
             return false;
diff --git a/test/uvw/emitter.cpp b/test/uvw/emitter.cpp
index 408bda86..29d9ec7c 100644
--- a/test/uvw/emitter.cpp
+++ b/test/uvw/emitter.cpp
@@ -27,7 +27,7 @@ TEST(ErrorEvent, Functionalities) {
 TEST(Emitter, Functionalities) {
     TestEmitter emitter{};
 
-    emitter.on<uvw::error_event>([](const uvw::error_event &, TestEmitter &) {});
+    emitter.on<uvw::error_event>([](const auto &, auto &) {});
 
     ASSERT_TRUE(emitter.has<uvw::error_event>());
     ASSERT_FALSE(emitter.has<FakeEvent>());