[Web Apps] Attempt to improve the error pages.
Merge branch 'trunk' into releases