Fixed null pointer issue in CQ5 build.