added null checking loop to find the damn cause of the NPE in travis, that happens sporadically