Merge "Null check listener before dereferencing for callback."