Check if result is null before looking for _next
Merge branch 'michel_2573_null' into next