Cleanup (avoid unneeded NPE)