Checked Servlet registration to avoid NullPointer for duplicated handlers

Change-Id: I34b5b2119f097db282a11de2d136843ae869da96