Fixing session listener issues

Signed-off-by: TanyaM <tanyamadurapperuma@gmail.com>