diff --git a/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py b/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py
index 0526c025d..cbdfabb1f 100644
--- a/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py
+++ b/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py
@@ -1,7 +1,7 @@
 import subprocess
 
 from moulinette import m18n
-from yunohost.utils.error import YunohostError
+from yunohost.utils.error import YunohostError, YunohostValidationError
 from moulinette.utils.log import getActionLogger
 
 from yunohost.tools import Migration
diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py
index fdf247f89..8d8be57a0 100644
--- a/src/yunohost/domain.py
+++ b/src/yunohost/domain.py
@@ -28,7 +28,7 @@ import re
 
 from moulinette import m18n, msettings, msignals
 from moulinette.core import MoulinetteError
-from yunohost.utils.error import YunohostError
+from yunohost.utils.error import YunohostError, YunohostValidationError
 from moulinette.utils.log import getActionLogger
 from moulinette.utils.filesystem import write_to_file
 
@@ -131,7 +131,7 @@ def domain_add(operation_logger, domain, dyndns=False):
     operation_logger.start()
 
     if dyndns:
-        from yunohost.dyndns import dndns_subscribe
+        from yunohost.dyndns import dyndns_subscribe
         # Actually subscribe
         dyndns_subscribe(domain=domain)
 
diff --git a/src/yunohost/ssh.py b/src/yunohost/ssh.py
index e9e7e1831..39d4b4287 100644
--- a/src/yunohost/ssh.py
+++ b/src/yunohost/ssh.py
@@ -5,7 +5,7 @@ import os
 import pwd
 import subprocess
 
-from yunohost.utils.error import YunohostError, YunohostValidationError
+from yunohost.utils.error import YunohostValidationError
 from moulinette.utils.filesystem import read_file, write_to_file, chown, chmod, mkdir
 
 SSHD_CONFIG_PATH = "/etc/ssh/sshd_config"