Index: bp-core/bp-core-buddybar.php
===================================================================
--- bp-core/bp-core-buddybar.php	(revision 6407)
+++ bp-core/bp-core-buddybar.php	(working copy)
@@ -373,8 +373,8 @@
  * Removes a navigation item from the sub navigation array used in BuddyPress themes.
  *
  * @package BuddyPress Core
- * @param $parent_id The id of the parent navigation item.
- * @param $slug The slug of the sub navigation item.
+ * @param int $parent_id The id of the parent navigation item.
+ * @param bool|string false if the parent item doesn't exist or $slug the slug of the sub navigation item.
  */
 function bp_core_remove_nav_item( $parent_id ) {
 	global $bp;
@@ -386,6 +386,9 @@
 		}
 	}
 
+	if ( empty( $bp->bp_nav[$parent_id] ) )
+    return false;
+
 	if ( $function = $bp->bp_nav[$parent_id]['screen_function'] ) {
 		if ( is_object( $function[0] ) ) {
 			remove_action( 'bp_screens', array( &$function[0], $function[1] ), 3 );