Fix timeout defaulting to 0 instead of none