fix None exeception