Improvements to the error pages - thanks DY