Fixed fiscal_year default logic to avoid int(None) exception