XX-9535 Request to track config changes
added null pointer protection