Fix NPE with TeamCity 8.1 #50