From 080dd74e016fbc99d3aaecd36ef932424042b768 Mon Sep 17 00:00:00 2001
From: inondle <qfulsher@gmail.com>
Date: Wed, 1 Jun 2016 13:08:59 -0700
Subject: [PATCH] Fixed #26616 -- Improved error message when AppConfig.name is
 invalid.

---
 django/apps/config.py | 9 ++++++++-
 tests/apps/tests.py   | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/django/apps/config.py b/django/apps/config.py
index edd7a48a6fa..88e52c1f05c 100644
--- a/django/apps/config.py
+++ b/django/apps/config.py
@@ -139,7 +139,14 @@ class AppConfig(object):
                 "'%s' must supply a name attribute." % entry)
 
         # Ensure app_name points to a valid module.
-        app_module = import_module(app_name)
+        try:
+            app_module = import_module(app_name)
+        except ImportError:
+            raise ImproperlyConfigured(
+                "Cannot import '%s'. Check that '%s.%s.name' is correct." % (
+                    app_name, mod_path, cls_name,
+                )
+            )
 
         # Entry is a path to an app config class.
         return cls(app_name, app_module)
diff --git a/tests/apps/tests.py b/tests/apps/tests.py
index c7fff0e7380..639ce97758e 100644
--- a/tests/apps/tests.py
+++ b/tests/apps/tests.py
@@ -78,7 +78,8 @@ class AppsTests(SimpleTestCase):
         with self.assertRaises(ImportError):
             with self.settings(INSTALLED_APPS=['there is no such app']):
                 pass
-        with self.assertRaises(ImportError):
+        msg = "Cannot import 'there is no such app'. Check that 'apps.apps.NoSuchApp.name' is correct."
+        with self.assertRaisesMessage(ImproperlyConfigured, msg):
             with self.settings(INSTALLED_APPS=['apps.apps.NoSuchApp']):
                 pass