fix for NPE
gradle .7 changes
Merge pull request #275 from Sereri/master

NPE fix, gradle .7