NPE fix, gradle .7