client: adds check for existing bond and fixes timout type

Fixes issues mentioned in the comments