Tweaking logic to not throw error on first update