diff --git a/instruments/hp/hp6632b.py b/instruments/hp/hp6632b.py
index b07407293..06e352558 100644
--- a/instruments/hp/hp6632b.py
+++ b/instruments/hp/hp6632b.py
@@ -468,6 +468,9 @@ def check_error_queue(self):
                 done = True
             else:
                 result.append(
-                    self.ErrorCodes(err) if err in self.ErrorCodes else err)
+                    self.ErrorCodes(err)
+                    if any(err == item.value for item in self.ErrorCodes)
+                    else err
+                )
 
         return result