SOS-1809 Should be continue not return