diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.c b/src/plugins/select/bluegene/plugin/bg_job_place.c
index 059ae0819e95ddd4f0e5716053bea82faff24f6b..9db29f901fb52cc4c67f918a39b674ec3b76e41f 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.c
@@ -112,8 +112,10 @@ static int _find_best_block_match(struct job_record* job_ptr,
 	   we want to fall through to tell the scheduler that it is runnable
 	   just not right now. 
 	*/
+	slurm_mutex_lock(&block_state_mutex);
 	if((full_system_block->job_running != -1) && checked<2) {
 		checked++;
+		slurm_mutex_unlock(&block_state_mutex);
 		select_g_set_jobinfo(job_ptr->select_jobinfo,
 				     SELECT_DATA_CHECKED, &checked);
 	
@@ -122,7 +124,8 @@ static int _find_best_block_match(struct job_record* job_ptr,
 		      full_system_block->bg_block_id);
 		return SLURM_ERROR;
 	}
-
+	slurm_mutex_unlock(&block_state_mutex);
+			
 	select_g_get_jobinfo(job_ptr->select_jobinfo,
 		SELECT_DATA_CONN_TYPE, &conn_type);
 	select_g_get_jobinfo(job_ptr->select_jobinfo,
@@ -208,8 +211,8 @@ static int _find_best_block_match(struct job_record* job_ptr,
 		 * Insure that any required nodes are in this BG block
 		 */
 		if (job_ptr->details->req_node_bitmap
-		&& (!bit_super_set(job_ptr->details->req_node_bitmap,
-				record->bitmap))) {
+		    && (!bit_super_set(job_ptr->details->req_node_bitmap,
+				       record->bitmap))) {
 			debug("bg block %s lacks required nodes",
 				record->bg_block_id);
 			continue;
diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c
index 27be07683432057ae09fb7de8a341131ac9cbc48..937275c7713fd38ba45df34f245209943fead6a9 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.c
+++ b/src/plugins/select/bluegene/plugin/bluegene.c
@@ -388,8 +388,7 @@ extern void set_block_user(bg_record_t *bg_record)
 		error("Unable to add user name to block %s. "
 		      "Cancelling job.",
 		      bg_record->bg_block_id);
-		(void) slurm_fail_job(
-			bg_record->job_running);
+		(void) slurm_fail_job(bg_record->job_running);
 	}	
 	xfree(bg_record->target_name);
 	bg_record->target_name =