Replace empty URL by none in the return URL field and remove commented code