diff --git a/almdrlib/client.py b/almdrlib/client.py
index 18ab3d6..67e8d4d 100644
--- a/almdrlib/client.py
+++ b/almdrlib/client.py
@@ -692,8 +692,8 @@ def __call__(self, *args, **kwargs):
             self._call = self._gen_call()
         try:
             return self._call(*args, **kwargs)
-        except Exception as e:
-            raise Exception(f"{self} failed {e}")
+        except AlmdrlibValueError as e:
+            raise AlmdrlibValueError(f'{self} failed {e}')
 
     def __repr__(self):
         return f"<{self._client.name}.{self.operation_id}: " \