diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
index eda24052..ed7a52d9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
@@ -93,7 +93,7 @@ public class ProvisioningManager {
         NewDeviceRegistrationReturn ret = null;
         String number = null;
         try {
-            logger.info("Waiting for link request from new device ...");
+            logger.info("Waiting for addDevice request from new device ...");
             ret = accountManager.getNewDeviceRegistration(tempIdentityKey);
             number = ret.getNumber();
             logger.info("Received link information from {}, linking in progress ...", number);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index d181f5d9..48b3767e 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -5,6 +5,8 @@ import org.asamk.signal.App;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.commands.SignalCreator;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.PathConfig;
 import org.asamk.signal.manager.ProvisioningManager;
@@ -162,9 +164,17 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
                     Manager manager = provisioningManager.finishDeviceLink(newDeviceName);
                     logger.info("Linking of " + newDeviceName + " successful");
                     manager.close();
-                } catch (IOException | TimeoutException | UserAlreadyExists e) {
-                    throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
-                }
+                } catch (TimeoutException e) {
+                    throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + "Link request timed out, please try again.");
+                } catch (IOException e) {
+                    throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + "Link request error: " + e.getMessage());
+                } catch (UserAlreadyExists e) {
+                    throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + "The user "
+                            + e.getUsername()
+                            + " already exists\nDelete \""
+                            + e.getFileName()
+                            + "\" before trying again.");
+                    }
             }).start();
             return deviceLinkUri.toString();
         } catch (TimeoutException | IOException e) {