Better treatment of exception during EOS fit