Replace goto EXIT with last CASE, to be uniform with previous change