End of error refactoring
Refactoring of errors done, engine validation done