Index: bp-default/functions.php
===================================================================
--- bp-default/functions.php	(revision 5992)
+++ bp-default/functions.php	(working copy)
@@ -30,13 +30,16 @@
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
 
-if ( ! function_exists( 'bp_is_active' ) )
-	return;
 
-// If BuddyPress is not activated, switch back to the default WP theme
+
+// If BuddyPress is not activated, switch back to the default WP theme first
 if ( ! defined( 'BP_VERSION' ) )
 	switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
 
+// And then escape from further action
+if ( ! function_exists( 'bp_is_active' ) )
+	return;
+	
 /**
  * Set the content width based on the theme's design and stylesheet.
  *