Refactorize code for save exceptions.
Fixing some tests.