Check for null values in listener
Readme