bit better handling of servlet container