diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index efb2c99..f80b482 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-18  Darin Adler  <darin@apple.com>
+
+        Reviewed by Adam.
+
+        - fix <rdar://problem/5350604> REGRESSION: Crash in inspector controller code after
+          clicking back button in test application (13250)
+
+        * page/InspectorController.cpp: (WebCore::InspectorController::addScriptResource):
+        Replace an assertion that was firing with some code that at least doesn't immediately crash.
+
 2007-07-22  Darin Adler  <darin@apple.com>
 
         Reviewed by Anders.
diff --git a/WebCore/page/InspectorController.cpp b/WebCore/page/InspectorController.cpp
index a70df43..ef537cf 100644
--- a/WebCore/page/InspectorController.cpp
+++ b/WebCore/page/InspectorController.cpp
@@ -726,7 +726,10 @@
 JSObjectRef InspectorController::addScriptResource(InspectorResource* resource)
 {
     ASSERT_ARG(resource, resource);
-    ASSERT(!resource->scriptObject);
+
+    // This happens for pages loaded from the back/forward cache.
+    if (resource->scriptObject)
+        return resource->scriptObject;
 
     ASSERT(m_scriptContext);
     ASSERT(m_scriptObject);