NPE fixed
Buildserver auto merge