[Issue #9] Refactoring initial error implementation