diff --git a/litex/soc/tools/remote/csr_builder.py b/litex/soc/tools/remote/csr_builder.py
index 07edc61e2..1bbb54a7c 100644
--- a/litex/soc/tools/remote/csr_builder.py
+++ b/litex/soc/tools/remote/csr_builder.py
@@ -14,7 +14,7 @@ class CSRElements:
             return self.__dict__[attr]
         except KeyError:
             pass
-        raise KeyError("No such element " + attr)
+        raise AttributeError("No such element " + attr)
 
 
 class CSRRegister: