diff --git a/django/forms/models.py b/django/forms/models.py
index a3c8f355a4..57dca31fca 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -519,7 +519,11 @@ class BaseInlineFormSet(BaseModelFormSet):
         if self._pk_field == self.fk:
             form.fields[self._pk_field.name] = InlineForeignKeyField(self.instance, pk_field=True)
         else:
-            form.fields[self.fk.name] = InlineForeignKeyField(self.instance, label=form.fields[self.fk.name].label)
+            # The foreign key field might not be on the form, so we poke at the
+            # Model field to get the label, since we need that for error messages.
+            form.fields[self.fk.name] = InlineForeignKeyField(self.instance,
+                label=getattr(form.fields.get(self.fk.name), 'label', capfirst(self.fk.verbose_name))
+            )
 
 def _get_foreign_key(parent_model, model, fk_name=None):
     """
diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py
index d849a7b9c1..ff6f170fa5 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/regressiontests/admin_views/models.py
@@ -177,6 +177,20 @@ class PersonaAdmin(admin.ModelAdmin):
         BarAccountAdmin
     )
 
+class Parent(models.Model):
+    name = models.CharField(max_length=128)
+
+class Child(models.Model):
+    parent = models.ForeignKey(Parent, editable=False)
+    name = models.CharField(max_length=30, blank=True)
+
+class ChildInline(admin.StackedInline):
+    model = Child
+
+class ParentAdmin(admin.ModelAdmin):
+    model = Parent
+    inlines = [ChildInline]
+
 admin.site.register(Article, ArticleAdmin)
 admin.site.register(CustomArticle, CustomArticleAdmin)
 admin.site.register(Section, inlines=[ArticleInline])
@@ -184,6 +198,7 @@ admin.site.register(ModelWithStringPrimaryKey)
 admin.site.register(Color)
 admin.site.register(Thing, ThingAdmin)
 admin.site.register(Persona, PersonaAdmin)
+admin.site.register(Parent, ParentAdmin)
 
 # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.
 # That way we cover all four cases:
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index 74cfcd3985..776bb024e1 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -819,3 +819,20 @@ class AdminInheritedInlinesTest(TestCase):
         self.failUnlessEqual(FooAccount.objects.all()[0].username, "%s-1" % foo_user)
         self.failUnlessEqual(BarAccount.objects.all()[0].username, "%s-1" % bar_user)
         self.failUnlessEqual(Persona.objects.all()[0].accounts.count(), 2)
+
+class TestInlineNotEditable(TestCase):
+    fixtures = ['admin-views-users.xml']
+
+    def setUp(self):
+        result = self.client.login(username='super', password='secret')
+        self.failUnlessEqual(result, True)
+
+    def tearDown(self):
+        self.client.logout()
+
+    def test(self):
+        """
+        InlineModelAdmin broken?
+        """
+        response = self.client.get('/test_admin/admin/admin_views/parent/add/')
+        self.failUnlessEqual(response.status_code, 200)