bit of extra checking
Merge pull request #215 from ministryofjustice/scrolling

bit of extra checking