cleanup, NPE quick fix