diff --git a/src/_pytest/main.py b/src/_pytest/main.py
index 105891e46..eae0bb255 100644
--- a/src/_pytest/main.py
+++ b/src/_pytest/main.py
@@ -505,8 +505,9 @@ class Session(nodes.FSCollector):
                             root = self._node_cache[pkginit]
                         else:
                             col = root._collectfile(pkginit)
-                            if col and isinstance(col, Package):
-                                root = col[0]
+                            if col:
+                                if isinstance(col[0], Package):
+                                    root = col[0]
                                 self._node_cache[root.fspath] = root
 
         # If it's a directory argument, recurse and look for any Subpackages.
diff --git a/testing/test_collection.py b/testing/test_collection.py
index 23d82cb14..6480cc85d 100644
--- a/testing/test_collection.py
+++ b/testing/test_collection.py
@@ -647,7 +647,7 @@ class Test_getinitialnodes(object):
         col = testdir.getnode(config, x)
         assert isinstance(col, pytest.Module)
         assert col.name == "x.py"
-        assert col.parent.parent is None
+        assert col.parent.parent.parent is None
         for col in col.listchain():
             assert col.config is config