Fix issues with modal error reporting