possible null pointer fix
cleanup