diff --git a/mozilla/extensions/cookie/nsCookies.cpp b/mozilla/extensions/cookie/nsCookies.cpp
index 36e9614a4c5..66b4d70bf88 100644
--- a/mozilla/extensions/cookie/nsCookies.cpp
+++ b/mozilla/extensions/cookie/nsCookies.cpp
@@ -177,7 +177,10 @@ COOKIE_RemoveAll()
     cookie_changed = PR_TRUE;
     delete cookie_list;
     cookie_list = nsnull;
-    Recycle(cookie_P3P);
+    if (cookie_P3P) {
+      Recycle(cookie_P3P);
+      cookie_P3P = nsnull;
+    }
   }
 }