Added ErrorHandler, updated display