Improved Error functionality.