Stop on null (produced when user clicks Cancel) rather than 'stop'