Bug 1024863 - Safeguard against potential race condition