Added null safe listener add and remove methods.