Litter NaN checks, also set rest in return value