Fixed NPE
Buildserver auto merge