diff --git a/mayan/apps/common/apps.py b/mayan/apps/common/apps.py
index 634b4fcb77..79e3ba2c3a 100644
--- a/mayan/apps/common/apps.py
+++ b/mayan/apps/common/apps.py
@@ -65,7 +65,7 @@ class MayanAppConfig(apps.AppConfig):
                 )
             ),
         except ImportError as exception:
-            if force_text(exception) != 'No module named urls':
+            if force_text(exception) not in ('No module named urls', 'No module named \'{}.urls\''.format(self.name)):
                 logger.error(
                     'Import time error when running AppConfig.ready(). Check '
                     'apps.py, urls.py, views.py, etc.'
diff --git a/mayan/apps/document_states/classes.py b/mayan/apps/document_states/classes.py
index 8e8912b56d..7a0cf8d1d2 100644
--- a/mayan/apps/document_states/classes.py
+++ b/mayan/apps/document_states/classes.py
@@ -66,7 +66,7 @@ class WorkflowAction(six.with_metaclass(WorkflowActionMetaclass, WorkflowActionB
             try:
                 import_module('{}.workflow_actions'.format(app.name))
             except ImportError as exception:
-                if force_text(exception) != 'No module named workflow_actions':
+                if force_text(exception) not in ('No module named workflow_actions', 'No module named \'{}.workflow_actions\''.format(app.name)):
                     logger.error(
                         'Error importing %s workflow_actions.py file; %s',
                         app.name, exception
diff --git a/mayan/apps/mailer/classes.py b/mayan/apps/mailer/classes.py
index 35c443922d..f2693394c7 100644
--- a/mayan/apps/mailer/classes.py
+++ b/mayan/apps/mailer/classes.py
@@ -64,7 +64,7 @@ class MailerBackend(six.with_metaclass(MailerBackendMetaclass, MailerBackendBase
             try:
                 import_module('{}.mailers'.format(app.name))
             except ImportError as exception:
-                if force_text(exception) != 'No module named mailers':
+                if force_text(exception) not in ('No module named mailers', 'No module named \'{}.mailers\''.format(app.name)):
                     logger.error(
                         'Error importing %s mailers.py file; %s', app.name,
                         exception
diff --git a/mayan/apps/smart_settings/classes.py b/mayan/apps/smart_settings/classes.py
index 0fdbbd86e2..90ceebdfe1 100644
--- a/mayan/apps/smart_settings/classes.py
+++ b/mayan/apps/smart_settings/classes.py
@@ -24,7 +24,7 @@ class Namespace(object):
             try:
                 import_module('{}.settings'.format(app.name))
             except ImportError as exception:
-                if force_text(exception) != 'No module named settings':
+                if force_text(exception) not in ('No module named settings', 'No module named \'{}.settings\''.format(app.name)):
                     logger.error(
                         'Error importing %s settings.py file; %s', app.name,
                         exception
@@ -84,7 +84,7 @@ class Setting(object):
         result = yaml.safe_dump(value, allow_unicode=True)
         # safe_dump returns bytestrings
         # Disregard the last 3 dots that mark the end of the YAML document
-        if result.endswith(b'...\n'):
+        if force_text(result).endswith('...\n'):
             result = result[:-4]
 
         return result