Refactored scrolling functionality to fail gracefully
Merge pull request #1186 from harvesthq/fix-scrolling-issue-take2

Refactored scrolling functionality to fail gracefully