cleanup, prevent NPE