Fix timeout race condition.
Fix timeout race condition.

FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup