Index: bp-core/admin/bp-core-functions.php
===================================================================
--- bp-core/admin/bp-core-functions.php
+++ bp-core/admin/bp-core-functions.php
@@ -10,6 +10,29 @@
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 
+/** Deactivation **************************************************************/
+
+/**
+ * When BuddyPress is deactivated, if the current theme is using bp-default,
+ * the theme must be switched to another one since bp-default will no longer exist.
+ *
+ * @uses wp_get_theme() Get info about the current theme
+ * @since 1.6-beta-2
+ */
+function bp_switch_theme_on_deactivate() {
+	$theme = wp_get_theme();
+	
+	// if the current theme is using bp-default, let's switch the theme
+	// when BP is deactivated to prevent WSOD on the front-end
+	if ( $theme->stylesheet == 'bp-default' ) {
+		switch_theme( 
+			apply_filters( 'bp_deactivate_switch_theme_template',   WP_DEFAULT_THEME ),
+			apply_filters( 'bp_deactivate_switch_theme_stylesheet', WP_DEFAULT_THEME )
+		);
+	}
+}
+add_action( 'bp_deactivation', 'bp_switch_theme_on_deactivate' );
+
 /** Menu **********************************************************************/
 
 /**