Test and minor cleanup to error window.