Avoid exit in code and better use of Sf2 command