Fix NPE
Merge pull request #302 from spotify/drewc/npefix

Fix NPE