Catch the poll does not exist exception for the reports
Merge branch 'master' into devel