diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 9e3e7c6061..e5eb50bb58 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -213,7 +213,7 @@ return array(
     'rsrc/externals/javelin/core/__tests__/install.js' => 'c432ee85',
     'rsrc/externals/javelin/core/__tests__/stratcom.js' => '88bf7313',
     'rsrc/externals/javelin/core/__tests__/util.js' => 'e251703d',
-    'rsrc/externals/javelin/core/init.js' => '638a4e2b',
+    'rsrc/externals/javelin/core/init.js' => '8d83d2a1',
     'rsrc/externals/javelin/core/init_node.js' => 'c234aded',
     'rsrc/externals/javelin/core/install.js' => '05270951',
     'rsrc/externals/javelin/core/util.js' => '93cc50d6',
@@ -694,7 +694,7 @@ return array(
     'javelin-install' => '05270951',
     'javelin-json' => '69adf288',
     'javelin-leader' => '7f243deb',
-    'javelin-magical-init' => '638a4e2b',
+    'javelin-magical-init' => '8d83d2a1',
     'javelin-mask' => '8a41885b',
     'javelin-quicksand' => '6b8ef10b',
     'javelin-reactor' => '2b8de964',
diff --git a/webroot/rsrc/externals/javelin/core/init.js b/webroot/rsrc/externals/javelin/core/init.js
index fb10b0f4c3..61c9f13d6d 100644
--- a/webroot/rsrc/externals/javelin/core/init.js
+++ b/webroot/rsrc/externals/javelin/core/init.js
@@ -214,8 +214,13 @@
     'mouseup'
   ];
 
-  if (window.localStorage) {
-    window_events.push('storage');
+  try {
+    if (window.localStorage) {
+      window_events.push('storage');
+    }
+  } catch (storage_exception) {
+    // See PHI985. In Firefox, accessing "window.localStorage" may throw an
+    // exception if cookies are disabled.
   }
 
   for (ii = 0; ii < window_events.length; ++ii) {