Revamp solver error management