CS fixes
Standardize return null;
Merge pull request #6227 from lucasmichot/5.0-return-null

[5.0] Standardize return null;