diff -r 202a7aabd4fe Lib/test/test_import/__init__.py
--- a/Lib/test/test_import/__init__.py	Sun Aug 09 13:11:36 2015 +0300
+++ b/Lib/test/test_import/__init__.py	Sun Aug 09 16:39:03 2015 -0700
@@ -324,6 +324,19 @@
         with self.assertRaisesRegex(ImportError, "^cannot import name 'bogus'"):
             from re import bogus
 
+    def test_from_import_AttributeError(self):
+        # Issue #24492: trying to import an attribute that raises an
+        # AttributeError should lead to an ImportError.
+        class AlwaysAttributeError:
+            def __getattr__(self, _):
+                raise AttributeError
+
+        module_name = 'test_from_import_AttributeError'
+        self.addCleanup(unload, module_name)
+        sys.modules[module_name] = AlwaysAttributeError()
+        with self.assertRaises(ImportError):
+            from test_from_import_AttributeError import does_not_exist
+
 
 @skip_if_dont_write_bytecode
 class FilePermissionTests(unittest.TestCase):
diff -r 202a7aabd4fe Python/ceval.c
--- a/Python/ceval.c	Sun Aug 09 13:11:36 2015 +0300
+++ b/Python/ceval.c	Sun Aug 09 16:39:03 2015 -0700
@@ -5085,19 +5085,24 @@
        sys.modules. */
     PyErr_Clear();
     pkgname = _PyObject_GetAttrId(v, &PyId___name__);
-    if (pkgname == NULL)
+    if (pkgname == NULL) {
+        goto error;
+    }
+    fullmodname = PyUnicode_FromFormat("%S.%U", pkgname, name);
+    Py_DECREF(pkgname);
+    if (fullmodname == NULL) {
         return NULL;
-    fullmodname = PyUnicode_FromFormat("%U.%U", pkgname, name);
-    Py_DECREF(pkgname);
-    if (fullmodname == NULL)
-        return NULL;
+    }
     x = PyDict_GetItem(PyImport_GetModuleDict(), fullmodname);
-    if (x == NULL)
-        PyErr_Format(PyExc_ImportError, "cannot import name %R", name);
-    else
-        Py_INCREF(x);
     Py_DECREF(fullmodname);
+    if (x == NULL) {
+        goto error;
+    }
+    Py_INCREF(x);
     return x;
+ error:
+    PyErr_Format(PyExc_ImportError, "cannot import name %R", name);
+    return NULL;
 }
 
 static int