Merge "Don't crash in case of race condition." into main