Make destination address optional and retarget automatically if missing