Merge "Add null check for thread name creation"