### Eclipse Workspace Patch 1.0
#P borisgloger
Index: wp-content/plugins/buddypress/bp-core/bp-core-signup.php
===================================================================
--- wp-content/plugins/buddypress/bp-core/bp-core-signup.php	(revision 158)
+++ wp-content/plugins/buddypress/bp-core/bp-core-signup.php	(working copy)
@@ -391,7 +391,7 @@
 			'user_email' => $user_email
 		) );
 
-		if ( !$user_id ) {
+		if ( !$user_id OR $user_id instanceof WP_Error ) {
 			$errors->add( 'registerfail', sprintf( __('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'buddypress' ), get_option( 'admin_email' ) ) );
 			return $errors;
 		}