Adding support for error messages in staging.