#164: replace return to exit