Defaults Timeout to None instead of 0