FR to help avoid race conditions

[johnkprice]

My feature request pertains to situations like this.