--- menu_block_split.old.module	2008-07-23 16:25:23.000000000 +0200
+++ menu_block_split.module	2008-08-05 00:54:41.000000000 +0200
@@ -119,13 +119,15 @@ function menu_block_split_block($op = 'l
     switch ($delta) {
       case $delta < 1000:
         $block['subject'] = variable_get('menu_block_splittitle_'. $delta, '');
-        $block['content'] = theme(menu_block_split_first_level_menu, variable_get('menu_block_split_'. $delta, ''));
+        $block['content'] = theme('menu_block_split_first_level_menu', variable_get('menu_block_split_'. $delta, ''));
         break;
       case 1000:
         $current_router_item = menu_get_item();
-        $current_menu_item = menu_block_split_get_menu_link_info($current_router_item['href']);
         for ($i = 1; $i <= variable_get('menu_block_split_howmany', 1); $i++) {
           $menu_name = variable_get('menu_block_split_'. $i, '');
+          $module = ($menu_name == 'navigation') ? 'system' : 'menu';
+          $current_menu_item = menu_block_split_get_menu_link_info($current_router_item['href'], $module);
+          
           $parent = menu_block_split_get_parent($current_menu_item);
           if($menu_name == $current_menu_item['menu_name']) { 
             if(menu_block_split_has_child($parent)) {// parent has a child?
@@ -136,7 +138,7 @@ function menu_block_split_block($op = 'l
           }
         }
     }
-    return $block;
+    return isset($block) ? $block : NULL;
   }
 }
 
@@ -152,7 +154,7 @@ function menu_block_split_first_level_me
     $link = theme('menu_item_link', $v);
     
     $in_active_trail = FALSE;
-    if($v['attributes']['class'] == 'active-trail') {
+    if((isset($v['attributes']) && isset($v['attributes']['class'])) && ($v['attributes']['class'] == 'active-trail')) {
       $in_active_trail = TRUE;
     }
     
@@ -190,7 +192,7 @@ function menu_block_split_has_child($par
 }
 
 function menu_block_split_get_menu_link_info($path, $module = 'menu') {
-  
+
   $link_info = db_fetch_array(db_query("SELECT menu_name, mlid, plid, link_path, router_path, link_title, options, module, hidden, external, has_children, expanded, weight, depth, customized, p1, p2, p3, p4, p5, p6, p7, p8, p9, updated FROM {menu_links} WHERE link_path = '%s' AND module = '%s'", $path, $module));
   
   return $link_info;
@@ -198,8 +200,9 @@ function menu_block_split_get_menu_link_
 
 function menu_block_split_second_level_tree($tree, $mlid) {
   
-  $menus = menu_get_menus();
-  $current_menu = array($current_menu_item['menu_name'] => $menus[$current_menu_item['menu_name']]);
+  // why is this here, which is not being used in this function?  
+  //$menus = menu_get_menus();
+  //$current_menu = array($current_menu_item['menu_name'] => $menus[$current_menu_item['menu_name']]);
   
   foreach($tree as $key => $value) {
     if($value['link']['mlid'] == $mlid)