[5.0] Standardize return null;