Deal with agent id not being known yet
Merge pull request #75 from guidow/missing_agent_id

Deal with agent id not being known yet
merging from #75