[artf638571] Null checked for sorting