Fix: check currentScroll for null

Fix: check currentScroll for null