Merge "Fix NULL check"