diff --git a/home_backup/client.py b/home_backup/client.py
index 511d4f2..31a1f1c 100644
--- a/home_backup/client.py
+++ b/home_backup/client.py
@@ -27,5 +27,9 @@ def remote_add_gen(name:str, rtype:str, info):
     async def remote_add(con:utils.Connection):
         result = await con.call({"operation": "remote-add", "name": name, "type": rtype, "info": info})
         if result["status"] != "success":
-            raise RuntimeError("Wasn't able to add remote.")  # TODO: Show error
+            if result["status"] == "fail-already-exists":
+                print("Remote %s already exists." % name)
+                exit(1)
+            else:
+                raise RuntimeError("Wasn't able to add remote.")  # TODO: Show error
     return remote_add
\ No newline at end of file
diff --git a/home_backup/user_service/remotes.py b/home_backup/user_service/remotes.py
index 3f07544..1934d94 100644
--- a/home_backup/user_service/remotes.py
+++ b/home_backup/user_service/remotes.py
@@ -63,7 +63,7 @@ async def add_remote(data:dict):
     async with config.config_lock:
         # Check
         if name in config.remotes:
-            raise ValueError("'%s' remote already exists." % name)
+            return {"status": "fail-already-exists"}
 
         # Set remote
         config.remotes[name] = rem