avoid NullpointerException
cleanup