Merge "Fix null dereference in debug check."