diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index e527c1a0ba..264922a83f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -117,7 +117,7 @@ static boolean isSignalClientAvailable() {
 
     void removeLinkedDevices(int deviceId) throws IOException;
 
-    void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException;
+    void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException;
 
     void setRegistrationLockPin(Optional<String> pin) throws IOException, NotPrimaryDeviceException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 3c7649e9f1..e8ab75a407 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -362,7 +362,10 @@ public void removeLinkedDevices(int deviceId) throws IOException {
     }
 
     @Override
-    public void addDeviceLink(DeviceLinkUrl linkUrl) throws IOException, InvalidDeviceLinkException {
+    public void addDeviceLink(DeviceLinkUrl linkUrl) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException {
+        if (!account.isPrimaryDevice()) {
+            throw new NotPrimaryDeviceException();
+        }
         context.getAccountHelper().addDevice(linkUrl);
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index 0895601a45..47cf87485c 100644
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -9,6 +9,7 @@
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.output.OutputWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,11 +50,13 @@ public void handleCommand(
             var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(linkUri);
             m.addDeviceLink(deviceLinkUrl);
         } catch (IOException e) {
-            logger.error("Add device link failed", e);
+            logger.error("Add device link failed: {}", e.getMessage());
             throw new IOErrorException("Add device link failed", e);
         } catch (InvalidDeviceLinkException e) {
-            logger.error("Add device link failed", e);
-            throw new UserErrorException("Add device link failed.", e);
+            logger.error("Invalid device link");
+            throw new UserErrorException("Invalid device link", e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
index 33de6e3085..a5af48d822 100644
--- a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
@@ -51,10 +51,10 @@ public void handleCommand(
                 var stickerPackUrl = StickerPackUrl.fromUri(stickerUri);
                 m.installStickerPack(stickerPackUrl);
             } catch (IOException e) {
-                logger.error("Install sticker pack failed", e);
+                logger.error("Install sticker pack failed: {}", e.getMessage());
                 throw new IOErrorException("Install sticker pack failed", e);
             } catch (StickerPackUrl.InvalidStickerPackLinkException e) {
-                logger.error("Invalid sticker pack link", e);
+                logger.error("Invalid sticker pack link");
                 throw new UserErrorException("Invalid sticker pack link", e);
             }
         }