Fix NullPointerException #9
Fix NullPointerException #10