Fixed NPEs
Buildserver auto merge