Fix tab errors
Probably fix intermittent irreproducible NPE