update webapplication making it more robust