Added servlet error handling