Fixed NPE #SCL-7559 Comment