BZ-13280 Fixed NPE and moved parsing of content into service