*  Refactoring in error handling mechanics