#2 Fixed Nullpointerexception bug