diff --git a/packages/hagrid/hagrid/orchestra.py b/packages/hagrid/hagrid/orchestra.py
index 099bd5e1f91..e2596824cf1 100644
--- a/packages/hagrid/hagrid/orchestra.py
+++ b/packages/hagrid/hagrid/orchestra.py
@@ -172,31 +172,18 @@ def client(self) -> Any:
             )
 
     def login_as_guest(self, **kwargs: Any) -> Optional[Any]:
-        client = self.client
-
-        session = client.login_as_guest(**kwargs)
-
-        if isinstance(session, SyftError):
-            return session
-
-        return session
+        return self.client.login_as_guest(**kwargs)
 
     def login(
         self, email: Optional[str] = None, password: Optional[str] = None, **kwargs: Any
     ) -> Optional[Any]:
-        client = self.client
-
         if not email:
             email = input("Email: ")
+
         if not password:
             password = getpass.getpass("Password: ")
 
-        session = client.login(email=email, password=password, **kwargs)
-
-        if isinstance(session, SyftError):
-            return session
-
-        return session
+        return self.client.login(email=email, password=password, **kwargs)
 
     def register(
         self,