next-error fixes