fixed null value handling
0.0.1 -> 0.0.2