Check for null listener

@Gregadeaux This now :)