Index: bp-themes/bp-default/groups/create.php
===================================================================
--- bp-themes/bp-default/groups/create.php	(revision 2229)
+++ bp-themes/bp-default/groups/create.php	(working copy)
@@ -157,52 +157,62 @@
 
 					<?php do_action( 'bp_before_group_invites_creation_step' ); ?>
 
-					<div class="left-menu">
+					<?php if ( bp_has_friends_to_invite() ) : ?>
 
-						<div id="invite-list">
-							<ul>
-								<?php bp_new_group_invite_friend_list() ?>
-							</ul>
+						<div class="left-menu">
 
-							<?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ) ?>
+							<div id="invite-list">
+								<ul>
+									<?php bp_new_group_invite_friend_list() ?>
+								</ul>
+
+								<?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ) ?>
+							</div>
+
 						</div>
 
-					</div>
+						<div class="main-column">
 
-					<div class="main-column">
+							<div id="message" class="info">
+								<p><?php _e('Select people to invite from your friends list.', 'buddypress'); ?></p>
+							</div>
 
-						<div id="message" class="info">
-							<p><?php _e('Select people to invite from your friends list.', 'buddypress'); ?></p>
-						</div>
+							<?php /* The ID 'friend-list' is important for AJAX support. */ ?>
+							<ul id="friend-list" class="item-list">
+							<?php if ( bp_group_has_invites() ) : ?>
 
-						<?php /* The ID 'friend-list' is important for AJAX support. */ ?>
-						<ul id="friend-list" class="item-list">
-						<?php if ( bp_group_has_invites() ) : ?>
+								<?php while ( bp_group_invites() ) : bp_group_the_invite(); ?>
 
-							<?php while ( bp_group_invites() ) : bp_group_the_invite(); ?>
+									<li id="<?php bp_group_invite_item_id() ?>">
+										<?php bp_group_invite_user_avatar() ?>
 
-								<li id="<?php bp_group_invite_item_id() ?>">
-									<?php bp_group_invite_user_avatar() ?>
+										<h4><?php bp_group_invite_user_link() ?></h4>
+										<span class="activity"><?php bp_group_invite_user_last_active() ?></span>
 
-									<h4><?php bp_group_invite_user_link() ?></h4>
-									<span class="activity"><?php bp_group_invite_user_last_active() ?></span>
+										<div class="action">
+											<a class="remove" href="<?php bp_group_invite_user_remove_invite_url() ?>" id="<?php bp_group_invite_item_id() ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a>
+										</div>
+									</li>
 
-									<div class="action">
-										<a class="remove" href="<?php bp_group_invite_user_remove_invite_url() ?>" id="<?php bp_group_invite_item_id() ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a>
-									</div>
-								</li>
+								<?php endwhile; ?>
 
-							<?php endwhile; ?>
+								<?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ) ?>
+							<?php endif; ?>
+							</ul>
 
-							<?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ) ?>
-						<?php endif; ?>
-						</ul>
+							<?php wp_nonce_field( 'groups_create_save_group-invites' ) ?>
 
-						<?php wp_nonce_field( 'groups_create_save_group-invites' ) ?>
+						</div>
 
+						<?php do_action( 'bp_after_group_invites_creation_step' ); ?>
+
+				<?php else : ?>
+
+					<div id="message" class="info">
+						<p><?php _e( 'You either need to build up your friends list, or your friends have already been invited or are current members.', 'buddypress' ); ?></p>
 					</div>
 
-					<?php do_action( 'bp_after_group_invites_creation_step' ); ?>
+				<?php endif; ?>
 
 				<?php endif; ?>
 
Index: bp-core/bp-core-classes.php
===================================================================
--- bp-core/bp-core-classes.php	(revision 2229)
+++ bp-core/bp-core-classes.php	(working copy)
@@ -145,7 +145,8 @@
 			$friend_ids = friends_get_friend_user_ids( $user_id );
 			$friend_ids = $wpdb->escape( implode( ',', (array)$friend_ids ) );
 
-			$sql['where_friends'] = "AND u.ID IN ({$friend_ids})";
+			if ( $friends_ids )
+				$sql['where_friends'] = "AND u.ID IN ({$friend_ids})";
 		}
 
 		if ( $search_terms && function_exists( 'xprofile_install' ) ) {