Add handling error messages.
Arranged source