refactor: Finalising error reporting & logging