--- includes/menu.inc	Mon Feb 09 10:27:35 2009
+++ includes/menu.inc	Thu Mar 05 20:51:24 2009
@@ -305,10 +305,15 @@
  */
 function menu_unserialize($data, $map) {
   if ($data = unserialize($data)) {
-    foreach ($data as $k => $v) {
-      if (is_int($v)) {
-        $data[$k] = isset($map[$v]) ? $map[$v] : '';
+    if (is_array($data)) {
+      foreach ($data as $k => $v) {
+        if (is_int($v)) {
+          $data[$k] = isset($map[$v]) ? $map[$v] : '';
+        }
       }
+    }
+    else {
+      watchdog('menu', 'unserialize returned non-array for %data', array('%data' => $data_s), WATCHDOG_ERROR);
     }
     return $data;
   }