Merge pull request #17 from PMJMendes/Paginator_NPE

Paginator NPE