Check for null listener

Jira issue: WP-934
Merge pull request #574 from paddybyers/ll_pzp_npe

Check for null listener