Slight refactor

Remove extra nulls being passed to next, instead of throwing error inline pass it to next so that the callback handles it