Merge branch 'stable-2.13' * stable-2.13: Add null protection Change-Id: I2d3d22da7147b3b5c5da395d362c85e693d3dc98