error messaging cleanup