Adding support for additional error and warning messages