added improved error pages