Made potential race conditions an error

Also added the means to override it.