Add remnants for Error handling feature (lack in previous commitment)