fixed null ref case
0.4.6