Updated for ErrorBoxing.