Refactory code to check null listener situation
Merge pull request #125 from KKBOX/master_daniel

Refactory code to check null listener situation