fix for bz972514 - handle cases where gear's server id is not set yet

[merge]