diff --git a/src/plugins/select/bluegene/bl_bgq/bridge_helper.cc b/src/plugins/select/bluegene/bl_bgq/bridge_helper.cc
index 2be3dda000b996e15aafe6b8f56db1b9a0e8641d..4a4196c33f256ad5d9d76fa1799b13cd61408c78 100644
--- a/src/plugins/select/bluegene/bl_bgq/bridge_helper.cc
+++ b/src/plugins/select/bluegene/bl_bgq/bridge_helper.cc
@@ -180,6 +180,13 @@ extern int bridge_handle_input_errors(const char *function, const uint32_t err,
 		      function, err);
 		rc = SLURM_ERROR;
 	}
+	if (bg_record && (rc == SLURM_SUCCESS)) {
+		/* Make sure we set this to free since if it isn't in
+		   the system and we are waiting for it to be free, we
+		   will be waiting around for a long time ;).
+		*/
+		bg_record->state = BG_BLOCK_FREE;
+	}
 	return rc;
 }
 
diff --git a/src/plugins/select/bluegene/bl_bgq/bridge_status.cc b/src/plugins/select/bluegene/bl_bgq/bridge_status.cc
index 4401534d0ede6369b056df7d65298ecf67078734..b221b0352145c8d9f5ec461069439a7adfedfe66 100644
--- a/src/plugins/select/bluegene/bl_bgq/bridge_status.cc
+++ b/src/plugins/select/bluegene/bl_bgq/bridge_status.cc
@@ -200,7 +200,8 @@ void event_handler::handleBlockStateChangedRealtimeEvent(
 	bg_record = find_bg_record_in_list(bg_lists->main, bg_block_id);
 	if (!bg_record) {
 		slurm_mutex_unlock(&block_state_mutex);
-		info("bg_record %s isn't in the main list", bg_block_id);
+		info("bridge_status: bg_record %s isn't in the main list",
+		     bg_block_id);
 		return;
 	}