Missed in the past refactoring.
Added comments about errors.