Fix possible NPE in RawServlet
Merge branch 'ticket/137' into develop