fix npe in devkit 1.7