refs #9955. Special treatment for errors too