Merge "Suppress null-dereference warning"