Improve Error Generator