Fixed defect 4 where we were not checking if listener was null