Added check for custom listener load