fixed null error on change year
and again...