Fixing an ordering dependency on when the exit command is interpreted.